claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into newqt2

Browse Source
This commit is contained in:
Cacodemon345
2022-04-24 00:58:08 +06:00
parent 6edc2a4c2b 01d6407c5c
commit d5df99fbd8
5 changed files with 33 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/qt/qt_mainwindow.cpp
View File

@@ -207,12 +207,12 @@ MainWindow::MainWindow(QWidget *parent) :
qt_mouse_capture(mouse_capture);
if (mouse_capture) {
this->grabKeyboard();
if (ui->stackedWidget->mouse_capture)
ui->stackedWidget->mouse_capture(this->windowHandle());
if (ui->stackedWidget->mouse_capture_func)
ui->stackedWidget->mouse_capture_func(this->windowHandle());
} else {
this->releaseKeyboard();
if (ui->stackedWidget->mouse_uncapture)
ui->stackedWidget->mouse_uncapture();
if (ui->stackedWidget->mouse_uncapture_func)
ui->stackedWidget->mouse_uncapture_func();
}
});
@@ -514,11 +514,11 @@ void MainWindow::closeEvent(QCloseEvent *event) {
}
qt_nvr_save();
config_save();
if (ui->stackedWidget->mouse_exit)
ui->stackedWidget->mouse_exit();
if (ui->stackedWidget->mouse_exit_func)
ui->stackedWidget->mouse_exit_func();
ui->stackedWidget->switchRenderer(RendererStack::Renderer::Software);
event->accept();
}