ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix cursor inconsistencies (fixes #69)

This commit is contained in:
Jeffrey Pfau 2015-08-04 19:14:19 -07:00
parent b0b0b46413
commit 6dda6cc841
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/platform/qt/Window.cpp
View File

@ -131,11 +131,11 @@ Window::Window(ConfigController* config, int playerId, QWidget* parent)
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 @@ void Window::enterFullScreen() {
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 @@ void Window::gameStopped() {
detachWidget(m_display);
m_screenWidget->setLockAspectRatio(m_logo.width(), m_logo.height());
m_screenWidget->setPixmap(m_logo);
m_screenWidget->unsetCursor();
m_fpsTimer.stop();
}