|
|
@@ -70,11 +70,11 @@ extern "C"
|
|
|
|
|
|
|
|
|
#if EMSCRIPTEN
|
|
|
-#define HANDLE_FOCUS_LOST 0
|
|
|
+# define HANDLE_FOCUS_LOST 0
|
|
|
#elif !SDL_VIDEO_OPENGL
|
|
|
-#define HANDLE_FOCUS_LOST 1
|
|
|
+# define HANDLE_FOCUS_LOST 1
|
|
|
#else
|
|
|
-#define HANDLE_FOCUS_LOST 0
|
|
|
+# define HANDLE_FOCUS_LOST 0
|
|
|
#endif
|
|
|
|
|
|
#define LOST_RESET_CONTEXT 0
|
|
|
@@ -534,7 +534,10 @@ namespace oxygine
|
|
|
if (!wnd)
|
|
|
{
|
|
|
if (!focus)
|
|
|
+ {
|
|
|
+ log::messageln("!focus");
|
|
|
return false;
|
|
|
+ }
|
|
|
|
|
|
wnd = _window;
|
|
|
}
|
|
|
@@ -549,6 +552,10 @@ namespace oxygine
|
|
|
IVideoDriver::_stats.start = getTimeMS();
|
|
|
updatePortProcessItems();
|
|
|
}
|
|
|
+ else
|
|
|
+ {
|
|
|
+ log::messageln("!ready");
|
|
|
+ }
|
|
|
|
|
|
return ready;
|
|
|
}
|
|
|
@@ -617,6 +624,8 @@ namespace oxygine
|
|
|
active = true;
|
|
|
*/
|
|
|
|
|
|
+ log::messageln("SDL_WINDOWEVENT %d", (int)event.window.event);
|
|
|
+
|
|
|
if (event.window.event == SDL_WINDOWEVENT_MINIMIZED)
|
|
|
active = false;
|
|
|
if (event.window.event == SDL_WINDOWEVENT_RESTORED)
|
|
|
@@ -627,6 +636,11 @@ namespace oxygine
|
|
|
newFocus = false;
|
|
|
if (event.window.event == SDL_WINDOWEVENT_FOCUS_GAINED)
|
|
|
newFocus = true;
|
|
|
+#ifdef __ANDROID__
|
|
|
+ if (event.window.event == SDL_WINDOWEVENT_ENTER)
|
|
|
+ newFocus = true;
|
|
|
+#endif
|
|
|
+
|
|
|
if (focus != newFocus)
|
|
|
{
|
|
|
#if HANDLE_FOCUS_LOST
|