mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-25 04:45:31 -07:00
Code Issues Packages Projects Releases Activity

Merge branch '86Box:master' into master

Browse Source
This commit is contained in:
starfrost
2025-07-16 12:25:09 +01:00
committed by GitHub
parent 8af0c40fbf 7fd7c659b6
commit 84376231f3
56 changed files with 2826 additions and 948 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/qt/qt_mainwindow.cpp
View File

@@ -1480,11 +1480,13 @@ MainWindow::eventFilter(QObject *receiver, QEvent *event)
if (receiver == this) {
static auto curdopause = dopause;
if (event->type() == QEvent::WindowBlocked) {
window_blocked = true;
curdopause = dopause;
plat_pause(isShowMessage ? 2 : 1);
emit setMouseCapture(false);
releaseKeyboard();
} else if (event->type() == QEvent::WindowUnblocked) {
window_blocked = false;
plat_pause(curdopause);
}
}
@@ -2138,7 +2140,7 @@ MainWindow::updateUiPauseState()
QString(tr("Pause execution"));
ui->actionPause->setIcon(pause_icon);
ui->actionPause->setToolTip(tooltip_text);
emit vmmRunningStateChanged(static_cast<VMManagerProtocol::RunningState>(dopause));
emit vmmRunningStateChanged(static_cast<VMManagerProtocol::RunningState>(window_blocked ? (dopause ? VMManagerProtocol::RunningState::PausedWaiting : VMManagerProtocol::RunningState::RunningWaiting) : (VMManagerProtocol::RunningState)dopause));
}
void