Added implementation of Window::hasFocus() on iOS

yangu-hury · Nov 11, 2014 · 6ef3cb2 · 6ef3cb2
1 parent e257909
commit 6ef3cb2
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 13 deletions.
diff --git a/src/SFML/Window/iOS/SFAppDelegate.mm b/src/SFML/Window/iOS/SFAppDelegate.mm
@@ -103,7 +103,7 @@ - (void)applicationWillResignActive:(UIApplication *)application
     {
         sf::Event event;
         event.type = sf::Event::LostFocus;
-        sfWindow->pushEvent(event);
+        sfWindow->forwardEvent(event);
     }
 }
 
@@ -127,7 +127,7 @@ - (void)applicationDidBecomeActive:(UIApplication *)application
     {
         sf::Event event;
         event.type = sf::Event::GainedFocus;
-        sfWindow->pushEvent(event);
+        sfWindow->forwardEvent(event);
     }
 }
 
@@ -147,7 +147,7 @@ - (void)applicationWillTerminate:(UIApplication *)application
     {
         sf::Event event;
         event.type = sf::Event::Closed;
-        sfWindow->pushEvent(event);
+        sfWindow->forwardEvent(event);
     }
 }
 
@@ -176,7 +176,7 @@ - (void)deviceOrientationDidChange:(NSNotification *)notification
             event.type = sf::Event::Resized;
             event.size.width = size.x;
             event.size.height = size.y;
-            sfWindow->pushEvent(event);
+            sfWindow->forwardEvent(event);
         }
     }
 }
@@ -215,7 +215,7 @@ - (void)notifyTouchBegin:(unsigned int)index atPosition:(sf::Vector2i)position;
         event.touch.finger = index;
         event.touch.x = position.x;
         event.touch.y = position.y;
-        sfWindow->pushEvent(event);
+        sfWindow->forwardEvent(event);
     }
 }
 
@@ -236,7 +236,7 @@ - (void)notifyTouchMove:(unsigned int)index atPosition:(sf::Vector2i)position;
         event.touch.finger = index;
         event.touch.x = position.x;
         event.touch.y = position.y;
-        sfWindow->pushEvent(event);
+        sfWindow->forwardEvent(event);
     }
 }
 
@@ -256,7 +256,7 @@ - (void)notifyTouchEnd:(unsigned int)index atPosition:(sf::Vector2i)position;
         event.touch.finger = index;
         event.touch.x = position.x;
         event.touch.y = position.y;
-        sfWindow->pushEvent(event);
+        sfWindow->forwardEvent(event);
     }
 }
 
@@ -269,7 +269,7 @@ - (void)notifyCharacter:(sf::Uint32)character
         sf::Event event;
         event.type = sf::Event::TextEntered;
         event.text.unicode = character;
-        sfWindow->pushEvent(event);
+        sfWindow->forwardEvent(event);
     }
 }
 

diff --git a/src/SFML/Window/iOS/WindowImplUIKit.hpp b/src/SFML/Window/iOS/WindowImplUIKit.hpp
@@ -174,7 +174,13 @@ class WindowImplUIKit : public WindowImpl
 
 public:
 
-    using WindowImpl::pushEvent;
+    ////////////////////////////////////////////////////////////
+    /// \brief Notify an event
+    ///
+    /// \param event Evenet to forward
+    ///
+    ////////////////////////////////////////////////////////////
+    void forwardEvent(Event event);
 
     ////////////////////////////////////////////////////////////
     /// \brief Get the window's view
@@ -208,6 +214,7 @@ class WindowImplUIKit : public WindowImpl
     UIWindow*         m_window;         ///< Pointer to the internal UIKit window
     SFView*           m_view;           ///< OpenGL view of the window
     SFViewController* m_viewController; ///< Controller attached to the view
+    bool              m_hasFocus;       ///< Current focus state of the window
 };
 
 } // namespace priv

diff --git a/src/SFML/Window/iOS/WindowImplUIKit.mm b/src/SFML/Window/iOS/WindowImplUIKit.mm
@@ -41,6 +41,7 @@
 ////////////////////////////////////////////////////////////
 WindowImplUIKit::WindowImplUIKit(WindowHandle handle)
 {
+    // Not implemented
 }
 
 
@@ -62,6 +63,7 @@
     // Create the window
     CGRect frame = [UIScreen mainScreen].bounds; // Ignore user size, it wouldn't make sense to use something else
     m_window = [[UIWindow alloc] initWithFrame:frame];
+    m_hasFocus = true;
 
     // Assign it to the application delegate
     [SFAppDelegate getInstance].sfWindow = this;
@@ -173,18 +175,29 @@
 ////////////////////////////////////////////////////////////
 void WindowImplUIKit::requestFocus()
 {
-    // Not applicable
+    // To implement
 }
 
 
 ////////////////////////////////////////////////////////////
 bool WindowImplUIKit::hasFocus() const
 {
-    // Not applicable
-    return false;
+    return m_hasFocus;
 }
 
-
+
+////////////////////////////////////////////////////////////
+void WindowImplUIKit::forwardEvent(Event event)
+{
+    if (event.type == Event::GainedFocus)
+        m_hasFocus = true;
+    else if (event.type == Event::LostFocus)
+        m_hasFocus = false;
+
+    pushEvent(event);
+}
+
+
 ////////////////////////////////////////////////////////////
 SFView* WindowImplUIKit::getGlView() const
 {