From 3dc8d7d4c9ee49344953039d7a2822af4803428b Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Sun, 31 May 2015 19:55:05 -0700
Subject: [PATCH] Qt: Only hide cursor in full screen

---
 CHANGES                     | 1 +
 src/platform/qt/Display.cpp | 1 -
 src/platform/qt/Window.cpp  | 2 ++
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index aac48239a..515d9314a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -50,6 +50,7 @@ Misc:
  - Qt: Migrate multiplayer window handling into GBAApp
  - Qt: Unified file opening and saving with last location
  - Qt: Fix windows being resizable when they shouldn't have been
+ - Qt: Only hide cursor in full screen
 
 0.2.1: (2015-05-13)
 Bugfixes:
diff --git a/src/platform/qt/Display.cpp b/src/platform/qt/Display.cpp
index 8ee580cec..8131627b0 100644
--- a/src/platform/qt/Display.cpp
+++ b/src/platform/qt/Display.cpp
@@ -16,5 +16,4 @@ Display::Display(QWidget* parent)
 {
 	setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
 	setMinimumSize(VIDEO_HORIZONTAL_PIXELS, VIDEO_VERTICAL_PIXELS);
-	setCursor(Qt::BlankCursor);
 }
diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp
index d6a24832b..d62319ce2 100644
--- a/src/platform/qt/Window.cpp
+++ b/src/platform/qt/Window.cpp
@@ -443,6 +443,7 @@ void Window::enterFullScreen() {
 		return;
 	}
 	showFullScreen();
+	setCursor(Qt::BlankCursor);
 #ifndef Q_OS_MAC
 	if (m_controller->isLoaded() && !m_controller->isPaused()) {
 		menuBar()->hide();
@@ -454,6 +455,7 @@ void Window::exitFullScreen() {
 	if (!isFullScreen()) {
 		return;
 	}
+	unsetCursor();
 	showNormal();
 	menuBar()->show();
 }