diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index 4013cf68d..eab756f56 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -374,6 +374,14 @@ void Window::dropEvent(QDropEvent* event) { m_controller->loadGame(url.path()); } +void Window::exitFullScreen() { + if (!isFullScreen()) { + return; + } + showNormal(); + menuBar()->show(); +} + void Window::toggleFullScreen() { if (isFullScreen()) { showNormal(); @@ -817,6 +825,8 @@ void Window::setupMenu(QMenuBar* menubar) { m_controller->setTurbo(false, false); }, QKeySequence(Qt::Key_Tab), tr("Fast Forward (held)"), "holdFastForward"); + addControlledAction(other, other->addAction(tr("Exit fullscreen"), this, SLOT(exitFullScreen()), QKeySequence("Esc")), "exitFullscreen"); + foreach (QAction* action, m_gameActions) { action->setDisabled(true); } diff --git a/src/platform/qt/Window.h b/src/platform/qt/Window.h index 8906cdaf6..d2d569e00 100644 --- a/src/platform/qt/Window.h +++ b/src/platform/qt/Window.h @@ -59,6 +59,7 @@ public slots: void selectROM(); void selectBIOS(); void selectPatch(); + void exitFullScreen(); void toggleFullScreen(); void loadConfig(); void saveConfig();