Merge branch 'develop' into 8.1.0-Dev
This commit is contained in:
@@ -768,7 +768,12 @@ namespace lime {
|
|||||||
|
|
||||||
case SDL_WINDOWEVENT_SHOWN: windowEvent.type = WINDOW_ACTIVATE; break;
|
case SDL_WINDOWEVENT_SHOWN: windowEvent.type = WINDOW_ACTIVATE; break;
|
||||||
case SDL_WINDOWEVENT_CLOSE: windowEvent.type = WINDOW_CLOSE; break;
|
case SDL_WINDOWEVENT_CLOSE: windowEvent.type = WINDOW_CLOSE; break;
|
||||||
case SDL_WINDOWEVENT_HIDDEN: windowEvent.type = WINDOW_DEACTIVATE; break;
|
case SDL_WINDOWEVENT_HIDDEN:
|
||||||
|
|
||||||
|
inBackground = true;
|
||||||
|
windowEvent.type = WINDOW_DEACTIVATE;
|
||||||
|
break;
|
||||||
|
|
||||||
case SDL_WINDOWEVENT_ENTER: windowEvent.type = WINDOW_ENTER; break;
|
case SDL_WINDOWEVENT_ENTER: windowEvent.type = WINDOW_ENTER; break;
|
||||||
case SDL_WINDOWEVENT_FOCUS_GAINED: windowEvent.type = WINDOW_FOCUS_IN; break;
|
case SDL_WINDOWEVENT_FOCUS_GAINED: windowEvent.type = WINDOW_FOCUS_IN; break;
|
||||||
case SDL_WINDOWEVENT_FOCUS_LOST: windowEvent.type = WINDOW_FOCUS_OUT; break;
|
case SDL_WINDOWEVENT_FOCUS_LOST: windowEvent.type = WINDOW_FOCUS_OUT; break;
|
||||||
@@ -798,6 +803,15 @@ namespace lime {
|
|||||||
windowEvent.windowID = event->window.windowID;
|
windowEvent.windowID = event->window.windowID;
|
||||||
WindowEvent::Dispatch (&windowEvent);
|
WindowEvent::Dispatch (&windowEvent);
|
||||||
|
|
||||||
|
switch (event->window.event) {
|
||||||
|
|
||||||
|
case SDL_WINDOWEVENT_SHOWN:
|
||||||
|
|
||||||
|
inBackground = false;
|
||||||
|
break;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user