80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #2537 from Cacodemon345/qt-settings-resizable-fix

Browse Source 
qt: Important bug fixes
This commit is contained in:
Jasmine Iwanek
2022-07-30 15:42:19 -04:00
committed by GitHub
parent 259505b3ca 180682aa36
commit 93482b51e3
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/config.c
View File

@@ -2767,7 +2767,7 @@ save_storage_controllers(void)
delete_section_if_empty(cat);
if (cassette_enable == 1)
if (cassette_enable == 0)
config_delete_var(cat, "cassette_enabled");
else
config_set_int(cat, "cassette_enabled", cassette_enable);

12
src/qt/qt_mainwindow.cpp
View File

@@ -1474,7 +1474,7 @@ void MainWindow::on_actionFullscreen_triggered() {
questionbox.exec();
config_save();
/* (re-capture mouse after dialog. */
/* (re-capture mouse after dialog). */
if (wasCaptured)
emit setMouseCapture(true);
}
@@ -1915,6 +1915,8 @@ void MainWindow::on_actionHiDPI_scaling_triggered()
void MainWindow::on_actionHide_status_bar_triggered()
{
auto w = ui->stackedWidget->width();
auto h = ui->stackedWidget->height();
hide_status_bar ^= 1;
ui->actionHide_status_bar->setChecked(hide_status_bar);
statusBar()->setVisible(!hide_status_bar);
@@ -1926,13 +1928,16 @@ void MainWindow::on_actionHide_status_bar_triggered()
} else {
int vid_resize_orig = vid_resize;
vid_resize = 0;
emit resizeContents(monitors[0].mon_scrnsz_x, monitors[0].mon_scrnsz_y);
emit resizeContents(w, h);
vid_resize = vid_resize_orig;
if (vid_resize == 1) setFixedSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
}
}
void MainWindow::on_actionHide_tool_bar_triggered()
{
auto w = ui->stackedWidget->width();
auto h = ui->stackedWidget->height();
hide_tool_bar ^= 1;
ui->actionHide_tool_bar->setChecked(hide_tool_bar);
ui->toolBar->setVisible(!hide_tool_bar);
@@ -1944,8 +1949,9 @@ void MainWindow::on_actionHide_tool_bar_triggered()
} else {
int vid_resize_orig = vid_resize;
vid_resize = 0;
emit resizeContents(monitors[0].mon_scrnsz_x, monitors[0].mon_scrnsz_y);
emit resizeContents(w, h);
vid_resize = vid_resize_orig;
if (vid_resize == 1) setFixedSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
}
}

2
src/qt/qt_settingsstoragecontrollers.cpp
View File

@@ -161,6 +161,8 @@ void SettingsStorageControllers::onCurrentMachineChanged(int machineId) {
int is_at = IS_AT(machineId);
ui->checkBoxTertiaryIDE->setEnabled(is_at > 0);
ui->checkBoxQuaternaryIDE->setEnabled(is_at > 0);
ui->checkBoxTertiaryIDE->setChecked(ui->checkBoxTertiaryIDE->isEnabled() && ide_ter_enabled);
ui->checkBoxQuaternaryIDE->setChecked(ui->checkBoxQuaternaryIDE->isEnabled() && ide_qua_enabled);
}
void SettingsStorageControllers::on_comboBoxHD_currentIndexChanged(int index) {