Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-26 23:10:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Qt: Hide menubar. Attach shortcuts to the main window so they still trigger when menubar is hidden. Fix bug with ctrl+number for screen size during full screen.

Browse Source
This commit is contained in:
Sacha 2013-11-21 13:48:16 +10:00
parent 392abf4a26
commit 061966dae2
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Qt/mainwindow.cpp
View File

@ -405,6 +405,8 @@ void MainWindow::fullscreenAct_triggered()
{
if(isFullScreen()) {
g_Config.bFullScreen = false;
menuBar()->show();
showNormal();
SetZoom(g_Config.iInternalResolution);
InitPadLayout();
@ -413,6 +415,7 @@ void MainWindow::fullscreenAct_triggered()
}
else {
g_Config.bFullScreen = true;
menuBar()->hide();
emugl->setFixedSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
setMaximumSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
@ -452,6 +455,8 @@ void MainWindow::aboutAct_triggered()
/* Private functions */
void MainWindow::SetZoom(int zoom) {
if (isFullScreen())
fullscreenAct_triggered();
g_Config.iInternalResolution = zoom;
pixel_xres = 480 * zoom;
@ -563,11 +568,12 @@ void MainWindow::createMenus()
#define NEW_ACTION_KEY(menu, name, key) \
NEW_ACTION(menu, name) \
name->setShortcut(key);
name->setShortcut(key); \
this->addAction(name);
#define NEW_ACTION_KEY_CHK(menu, name, key) \
NEW_ACTION_CHK(menu, name) \
name->setShortcut(key);
NEW_ACTION_KEY(menu, name, key) \
name->setCheckable(true);
#define NEW_GROUP(menu, group, stringlist, valuelist) \
{ \
@ -594,6 +600,7 @@ void MainWindow::createMenus()
action->setData(i.next()); \
action->setShortcut(k.next()); \
group->addAction(action); \
this->addAction(action); \
} \
connect(group, SIGNAL(triggered(QAction *)), this, SLOT(group ## _triggered(QAction *))); \
menu->addActions(group->actions()); \