X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fandroid%2Fwindow.cpp;h=ec632aaeafd96b5948e72fe5812b18cc3937249f;hb=1ea8498c4c729f849095e2f4aa3d282de2000a35;hp=3a584203527743e18ae4d8c5b5e849bba3b66a50;hpb=1d7113259625a91f5f6d2f53365aad22ae744689;p=libs%2Fgui.git diff --git a/source/graphics/android/window.cpp b/source/graphics/android/window.cpp index 3a58420..ec632aa 100644 --- a/source/graphics/android/window.cpp +++ b/source/graphics/android/window.cpp @@ -1,7 +1,7 @@ -#include "display.h" -#include "display_private.h" #include "window.h" #include "window_private.h" +#include "display.h" +#include "display_private.h" using namespace std; @@ -10,7 +10,6 @@ namespace Graphics { void Window::platform_init() { - priv->window = 0; } void Window::platform_cleanup() @@ -57,6 +56,7 @@ bool Window::event(const Event &evnt) display.remove_window(*this); display.add_window(*this); priv->signal_window_acquired.emit(priv->window); + signal_got_focus.emit(); break; case WINDOW_RESIZED: options.width = ANativeWindow_getWidth(priv->window); @@ -64,8 +64,9 @@ bool Window::event(const Event &evnt) signal_resize.emit(options.width, options.height); break; case WINDOW_DESTROYED: + signal_lost_focus.emit(); priv->signal_window_lost.emit(); - priv->window = 0; + priv->window = nullptr; display.remove_window(*this); display.add_window(*this); break;