From 1b74517e8bbf7507162d46adcf55256b4068a8ec Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sun, 3 May 2015 03:33:19 -0700 Subject: [PATCH] Qt: Move exit fullscreen to the frame size menu --- src/platform/qt/Window.cpp | 15 ++++++++++----- src/platform/qt/Window.h | 1 + 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index 9403a1ae0..04d4163f4 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -1016,10 +1016,10 @@ void Window::setupMenu(QMenuBar* menubar) { m_inputController.setAllowOpposing(value.toBool()); }, this); - QMenu* other = new QMenu(tr("Other"), this); - m_shortcutController->addMenu(other); - - addControlledAction(other, other->addAction(tr("Exit fullscreen"), this, SLOT(exitFullScreen()), QKeySequence("Esc")), "exitFullScreen"); + QAction* exitFullScreen = new QAction(tr("Exit fullscreen"), frameMenu); + connect(exitFullScreen, SIGNAL(triggered()), this, SLOT(exitFullScreen())); + exitFullScreen->setShortcut(QKeySequence("Esc")); + addHiddenAction(frameMenu, exitFullScreen, "exitFullScreen"); foreach (QAction* action, m_gameActions) { action->setDisabled(true); @@ -1066,8 +1066,13 @@ void Window::updateMRU() { } QAction* Window::addControlledAction(QMenu* menu, QAction* action, const QString& name) { - m_shortcutController->addAction(menu, action, name); + addHiddenAction(menu, action, name); menu->addAction(action); + return action; +} + +QAction* Window::addHiddenAction(QMenu* menu, QAction* action, const QString& name) { + m_shortcutController->addAction(menu, action, name); action->setShortcutContext(Qt::WidgetShortcut); addAction(action); return action; diff --git a/src/platform/qt/Window.h b/src/platform/qt/Window.h index 041bc6e07..d2683dc60 100644 --- a/src/platform/qt/Window.h +++ b/src/platform/qt/Window.h @@ -131,6 +131,7 @@ private: void openView(QWidget* widget); QAction* addControlledAction(QMenu* menu, QAction* action, const QString& name); + QAction* addHiddenAction(QMenu* menu, QAction* action, const QString& name); GameController* m_controller; Display* m_display;