OK, I have added a fix to svn in trunk and 1.5 branch.
I would be glad if anyone else could test new behaviour as there is really a lot of stuff that can go wrong. My test-code is below (I will probably add it later to irrlicht-tests, but don't know yet in which folder I should put manual tests):
Code: Select all
#include <irrlicht.h>
#include <iostream>
using namespace irr;
using namespace core;
using namespace scene;
using namespace video;
using namespace io;
using namespace gui;
#ifdef _IRR_WINDOWS_
#pragma comment(lib, "Irrlicht.lib")
#endif
enum
{
E_RIGHT_CLICK_MENUES = 1,
E_LEFT_CLICK_AREA,
};
struct SAppContext
{
IrrlichtDevice * Device;
gui::IGUIEnvironment* Environment;
gui::IGUIStaticText* LeftClickArea;
gui::IGUIStaticText* StatusBar;
gui::IGUIButton * CreateRightClickMenues;
};
void FillMenu( gui::IGUIContextMenu* menu )
{
menu->addItem(L"top1", -1, true, true);
menu->addItem(L"top2", -1, true, true);
menu->addItem(L"no sub", -1, true, false);
IGUIContextMenu* submenu = menu->getSubMenu(0);
if ( submenu )
{
submenu->addItem(L"item1", -1);
submenu->addSeparator();
submenu->addItem(L"item2", -1);
submenu->addItem(L"checked", -1, true, false, true);
submenu->addItem(L"sub1", -1, true, true, false );
submenu->addItem(L"sub2", -1, true, true, false );
submenu->addItem(L"disabled", -1, false, false, false);
}
IGUIContextMenu* subsubmenu = submenu->getSubMenu(4);
if ( subsubmenu )
{
subsubmenu->addItem(L"subitemA", -1);
subsubmenu->addItem(L"subitemB", -1);
}
subsubmenu = submenu->getSubMenu(5);
if ( subsubmenu )
{
subsubmenu->addItem(L"subitemC", -1);
subsubmenu->addItem(L"subitemD", -1);
}
submenu = menu->getSubMenu(1);
if ( submenu )
{
submenu->addItem(L"item", -1);
}
}
class MyEventReceiver : public IEventReceiver
{
public:
MyEventReceiver(SAppContext & context) : Context(context), ContextMenu(0) { }
void ShowContextMenu(irr::s32 x, irr::s32 y)
{
core::rect<s32> rect(x, y, x+50, y+50);
ContextMenu = Context.Environment->addContextMenu (rect);
FillMenu(ContextMenu);
};
virtual bool OnEvent(const SEvent& event)
{
if (event.EventType == EET_MOUSE_INPUT_EVENT )
{
if ( event.MouseInput.Event == EMIE_RMOUSE_PRESSED_DOWN )
{
if ( !Context.LeftClickArea->isPointInside( core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y) )
&& Context.CreateRightClickMenues->isPressed()
)
{
ShowContextMenu(event.MouseInput.X, event.MouseInput.Y);
}
}
if ( event.MouseInput.Event == EMIE_LMOUSE_LEFT_UP )
{
Context.StatusBar->setText(L"");
if ( Context.LeftClickArea->isPointInside( core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y) ) )
{
ShowContextMenu(event.MouseInput.X, event.MouseInput.Y);
return true;
}
}
}
if (event.EventType == EET_GUI_EVENT)
{
s32 id = event.GUIEvent.Caller->getID();
switch(event.GUIEvent.EventType)
{
case EGET_MENU_ITEM_SELECTED:
{
IGUIContextMenu * menu = static_cast<IGUIContextMenu*>(event.GUIEvent.Caller);
s32 idx = menu->getSelectedItem();
if ( idx >= 0 )
Context.StatusBar->setText(menu->getItemText(idx));
else
Context.StatusBar->setText(L"selected event, but no item selected - should never happen.");
break;
}
default:
break;
}
}
return false;
}
private:
SAppContext & Context;
gui::IGUIContextMenu* ContextMenu;
};
int main()
{
video::E_DRIVER_TYPE driverType = video::EDT_OPENGL;
//IrrlichtDevice * device = createDevice(driverType, core::dimension2d<s32>(640, 480)); // <= irrlicht 1.5
IrrlichtDevice * device = createDevice(driverType, core::dimension2d<u32>(640, 480)); // >= irrlicht 1.6
if (device == 0)
return 1; // could not create selected driver.
video::IVideoDriver* driver = device->getVideoDriver();
IGUIEnvironment* env = device->getGUIEnvironment();
SAppContext context;
context.Device = device;
context.Environment = env;
// menu bar in main window
gui::IGUIContextMenu* menuBar = env->addMenu (0, -1);
FillMenu(menuBar);
// some dummy button below menu to see if mouse-clicks are correctly eaten by the menu
core::rect<s32> rectBtn(0, 15, 150, 90);
context.CreateRightClickMenues = env->addButton (rectBtn, 0, E_RIGHT_CLICK_MENUES, L"right-click context menu");
context.CreateRightClickMenues->setIsPushButton(true);
// menu bar in sub-window
core::rect<s32> rectWnd(10, 100, 300, 200);
IGUIWindow * wnd = env->addWindow (rectWnd, false, L"window", NULL, -1);
gui::IGUIContextMenu* menuBar2 = env->addMenu (wnd, -1);
FillMenu(menuBar2);
core::rect<s32> rectStatic(10, 359, 150, 400);
context.LeftClickArea = env->addStaticText (L"left click menu", rectStatic, true, true, 0, E_LEFT_CLICK_AREA, true);
core::rect<s32> rectStatusBar(0, 450, 640, 480);
context.StatusBar = env->addStaticText (L"", rectStatusBar, true, false);
MyEventReceiver receiver(context);
device->setEventReceiver(&receiver);
while(device->run() && driver)
{
if (device->isWindowActive())
{
driver->beginScene(true, true, SColor(0,200,200,200));
env->drawAll();
driver->endScene();
}
}
device->drop();
return 0;
}
A few things which I already know about and about which I will probably care at some time are:
- Putting menus in IGUIWindow looks ugly (because we have no clientRect areas in gui-elements so far).
- Missing an automatic check-flag
- Context menus removing themselves is probably not always ok, that might need another option (but I need some more tests for that)
If anyone sees more problems with menus, please tell me.
edit: fixed a problem I had with left-clicks.
