mirror of
https://github.com/86Box/86Box.git
synced 2026-02-22 01:25:33 -07:00
Add option to show UI while in fullscreen
This commit is contained in:
@@ -286,6 +286,11 @@ struct accelKey def_acc_keys[NUM_ACCELS] = {
|
||||
.name="mute",
|
||||
.desc="Toggle mute",
|
||||
.seq="Ctrl+Alt+M"
|
||||
},
|
||||
{
|
||||
.name="toggle_ui_fullscreen",
|
||||
.desc="Toggle UI in fullscreen",
|
||||
.seq="Ctrl+Alt+PgDown"
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -288,7 +288,7 @@ struct accelKey {
|
||||
char desc[64];
|
||||
char seq[64];
|
||||
};
|
||||
#define NUM_ACCELS 8
|
||||
#define NUM_ACCELS 9
|
||||
extern struct accelKey acc_keys[NUM_ACCELS];
|
||||
extern struct accelKey def_acc_keys[NUM_ACCELS];
|
||||
extern int FindAccelerator(const char *name);
|
||||
|
||||
@@ -1464,6 +1464,7 @@ MainWindow::on_actionFullscreen_triggered()
|
||||
if (!hide_tool_bar)
|
||||
ui->toolBar->show();
|
||||
video_fullscreen = 0;
|
||||
fullscreen_ui_visible = false;
|
||||
if (vid_resize != 1) {
|
||||
emit resizeContents(vid_resize == 2 ? fixed_size_x : monitors[0].mon_scrnsz_x, vid_resize == 2 ? fixed_size_y : monitors[0].mon_scrnsz_y);
|
||||
}
|
||||
@@ -1558,6 +1559,10 @@ MainWindow::eventFilter(QObject *receiver, QEvent *event)
|
||||
|| (QKeySequence) (ke->key() | ke->modifiers()) == FindAcceleratorSeq("mute")) {
|
||||
ui->actionMute_Unmute->trigger();
|
||||
}
|
||||
if ((QKeySequence) (ke->key() | (ke->modifiers() & ~Qt::KeypadModifier)) == FindAcceleratorSeq("toggle_ui_fullscreen")
|
||||
|| (QKeySequence) (ke->key() | ke->modifiers()) == FindAcceleratorSeq("toggle_ui_fullscreen")) {
|
||||
toggleFullscreenUI();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -2206,6 +2211,18 @@ MainWindow::on_actionUpdate_status_bar_icons_triggered()
|
||||
status->clearActivity();
|
||||
}
|
||||
|
||||
void
|
||||
MainWindow::toggleFullscreenUI()
|
||||
{
|
||||
if (video_fullscreen == 0)
|
||||
return;
|
||||
|
||||
fullscreen_ui_visible ^= 1;
|
||||
ui->menubar->setVisible(fullscreen_ui_visible);
|
||||
ui->statusbar->setVisible(fullscreen_ui_visible && !hide_status_bar);
|
||||
ui->toolBar->setVisible(fullscreen_ui_visible && !hide_tool_bar);
|
||||
}
|
||||
|
||||
void
|
||||
MainWindow::on_actionTake_screenshot_triggered()
|
||||
{
|
||||
|
||||
@@ -130,6 +130,7 @@ private slots:
|
||||
void on_actionHide_tool_bar_triggered();
|
||||
void on_actionUpdate_status_bar_icons_triggered();
|
||||
void on_actionTake_screenshot_triggered();
|
||||
void toggleFullscreenUI();
|
||||
void on_actionMute_Unmute_triggered();
|
||||
void on_actionSound_gain_triggered();
|
||||
void on_actionPreferences_triggered();
|
||||
@@ -197,6 +198,9 @@ private:
|
||||
/* Reload the renderers after closing renderer options dialog. */
|
||||
bool reload_renderers = false;
|
||||
|
||||
/* Fullscreen UI visibility state */
|
||||
bool fullscreen_ui_visible = false;
|
||||
|
||||
friend class SpecifyDimensions;
|
||||
friend class ProgSettings;
|
||||
friend class RendererCommon;
|
||||
|
||||
Reference in New Issue
Block a user