From ab4d4d74776391f767fd549ba89afffb59c2691a Mon Sep 17 00:00:00 2001 From: Mario Liebisch Date: Mon, 13 Oct 2014 14:33:48 +0200 Subject: [PATCH] [Android] Implemented `sf::Window::hasFocus()` --- src/SFML/Window/Android/WindowImplAndroid.cpp | 7 +++++-- src/SFML/Window/Android/WindowImplAndroid.hpp | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/SFML/Window/Android/WindowImplAndroid.cpp b/src/SFML/Window/Android/WindowImplAndroid.cpp index 22cf60cab..6f0b14db2 100644 --- a/src/SFML/Window/Android/WindowImplAndroid.cpp +++ b/src/SFML/Window/Android/WindowImplAndroid.cpp @@ -51,6 +51,7 @@ WindowImplAndroid::WindowImplAndroid(WindowHandle handle) : m_size(0, 0) , m_windowBeingCreated(false) , m_windowBeingDestroyed(false) +, m_hasFocus(false) { } @@ -60,6 +61,7 @@ WindowImplAndroid::WindowImplAndroid(VideoMode mode, const String& title, unsign : m_size(mode.width, mode.height) , m_windowBeingCreated(false) , m_windowBeingDestroyed(false) +, m_hasFocus(false) { ActivityStates* states = getActivity(NULL); Lock lock(states->mutex); @@ -191,8 +193,7 @@ void WindowImplAndroid::requestFocus() //////////////////////////////////////////////////////////// bool WindowImplAndroid::hasFocus() const { - // Not applicable - return false; + return m_hasFocus; } @@ -206,10 +207,12 @@ void WindowImplAndroid::forwardEvent(const Event& event) WindowImplAndroid::singleInstance->m_size.x = ANativeWindow_getWidth(states->window); WindowImplAndroid::singleInstance->m_size.y = ANativeWindow_getHeight(states->window); WindowImplAndroid::singleInstance->m_windowBeingCreated = true; + WindowImplAndroid::singleInstance->m_hasFocus = true; } else if (event.type == Event::LostFocus) { WindowImplAndroid::singleInstance->m_windowBeingDestroyed = true; + WindowImplAndroid::singleInstance->m_hasFocus = false; } WindowImplAndroid::singleInstance->pushEvent(event); diff --git a/src/SFML/Window/Android/WindowImplAndroid.hpp b/src/SFML/Window/Android/WindowImplAndroid.hpp index f5106e3ae..275bb51a8 100644 --- a/src/SFML/Window/Android/WindowImplAndroid.hpp +++ b/src/SFML/Window/Android/WindowImplAndroid.hpp @@ -222,6 +222,7 @@ private: Vector2u m_size; bool m_windowBeingCreated; bool m_windowBeingDestroyed; + bool m_hasFocus; }; } // namespace priv