all repos — mgba @ 6dda6cc8414103fd7bd901e588e55a892d669ad5

mGBA Game Boy Advance Emulator

Qt: Fix cursor inconsistencies (fixes #69)
Jeffrey Pfau jeffrey@endrift.com
Tue, 04 Aug 2015 19:14:19 -0700
commit

6dda6cc8414103fd7bd901e588e55a892d669ad5

parent

b0b0b464131d25c8cab45594db6137c589dfc71e

1 files changed, 4 insertions(+), 4 deletions(-)

jump to
M src/platform/qt/Window.cppsrc/platform/qt/Window.cpp

@@ -131,11 +131,11 @@ connect(this, SIGNAL(fpsTargetChanged(float)), m_controller, SLOT(setFPSTarget(float)));

connect(&m_fpsTimer, SIGNAL(timeout()), this, SLOT(showFPS())); connect(m_display, &Display::hideCursor, [this]() { if (static_cast<QStackedLayout*>(m_screenWidget->layout())->currentWidget() == m_display) { - setCursor(Qt::BlankCursor); + m_screenWidget->setCursor(Qt::BlankCursor); } }); connect(m_display, &Display::showCursor, [this]() { - unsetCursor(); + m_screenWidget->unsetCursor(); }); connect(&m_inputController, SIGNAL(profileLoaded(const QString&)), m_shortcutController, SLOT(loadProfile(const QString&)));

@@ -481,7 +481,6 @@ if (isFullScreen()) {

return; } showFullScreen(); - setCursor(Qt::BlankCursor); #ifndef Q_OS_MAC if (m_controller->isLoaded() && !m_controller->isPaused()) { menuBar()->hide();

@@ -493,7 +492,7 @@ void Window::exitFullScreen() {

if (!isFullScreen()) { return; } - unsetCursor(); + m_screenWidget->unsetCursor(); menuBar()->show(); showNormal(); }

@@ -544,6 +543,7 @@ updateTitle();

detachWidget(m_display); m_screenWidget->setLockAspectRatio(m_logo.width(), m_logo.height()); m_screenWidget->setPixmap(m_logo); + m_screenWidget->unsetCursor(); m_fpsTimer.stop(); }