From 550fb2b60a962ffcc6c91b8100f7b46a47aafb08 Mon Sep 17 00:00:00 2001
From: Marco Antognini <antognini.marco@gmail.com>
Date: Fri, 16 Sep 2016 09:24:39 +0200
Subject: [PATCH] Fixed inconsistency between doc and impl on OS X for the grab
feature
Patch for #1133 and #1148.
---
src/SFML/Window/OSX/SFOpenGLView+mouse.mm | 2 +-
src/SFML/Window/OSX/SFOpenGLView+mouse_priv.h | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/SFML/Window/OSX/SFOpenGLView+mouse.mm b/src/SFML/Window/OSX/SFOpenGLView+mouse.mm
index 63490814..5cc1f897 100644
--- a/src/SFML/Window/OSX/SFOpenGLView+mouse.mm
+++ b/src/SFML/Window/OSX/SFOpenGLView+mouse.mm
@@ -230,7 +230,7 @@
////////////////////////////////////////////////////////
-(BOOL)isCursorCurrentlyGrabbed
{
- return [[self window] isKeyWindow] && (m_cursorGrabbed || m_fullscreen);
+ return [[self window] isKeyWindow] && m_cursorGrabbed;
}
diff --git a/src/SFML/Window/OSX/SFOpenGLView+mouse_priv.h b/src/SFML/Window/OSX/SFOpenGLView+mouse_priv.h
index f9b2ab75..27cd388c 100644
--- a/src/SFML/Window/OSX/SFOpenGLView+mouse_priv.h
+++ b/src/SFML/Window/OSX/SFOpenGLView+mouse_priv.h
@@ -70,8 +70,7 @@
/// \brief Check whether the cursor is grabbed or not
///
/// The cursor is grabbed if the window is active (key) and
-/// either it is in fullscreen mode or the user wants to
-/// grab it.
+/// the user wants to grab it.
///
////////////////////////////////////////////////////////////
-(BOOL)isCursorCurrentlyGrabbed;