marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mac: Fix exclusive dialogs not clickable in game mode

stable-5.2
Martin Plicht 2012-03-25 12:08:06 +02:00
parent a28cad6947
commit 2c597ba56d
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/C4GuiDialogs.cpp
View File

@ -879,14 +879,11 @@ namespace C4GUI
// main message loop
while (fShow)
{
while (fShow)
{
// dialog idle proc
OnIdle();
// handle messages - this may block until the next timer
if (!Application.ScheduleProcs())
return false; // game GUI and lobby will deleted in Game::Clear()
}
// dialog idle proc
OnIdle();
// handle messages - this may block until the next timer
if (!Application.ScheduleProcs())
return false; // game GUI and lobby will deleted in Game::Clear()
}
// return whether dlg was OK
return fOK;

2
src/platform/ClonkOpenGLView.mm
View File

@ -211,7 +211,7 @@ int32_t mouseButtonFromEvent(NSEvent* event, DWORD* modifierFlags)
DWORD keyMask = flags;
if ([event type] == NSScrollWheel)
keyMask |= (int)[event deltaY] << 16;
::C4GUI::MouseMove(button, x, y, keyMask, viewport);
::C4GUI::MouseMove(button, x, y, keyMask, Application.isEditor ? viewport : NULL);
}
else if (viewport)
{