From 46ae1780c5268ef48bbafeef5fa6b98a604482b9 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sat, 5 Apr 2025 14:32:09 +1000 Subject: [PATCH] Qt: Fix double-click-fullscreen with notifications up --- src/core/fullscreen_ui.cpp | 6 +++--- src/duckstation-qt/displaywidget.cpp | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/core/fullscreen_ui.cpp b/src/core/fullscreen_ui.cpp index dee64297d..6cee31a3e 100644 --- a/src/core/fullscreen_ui.cpp +++ b/src/core/fullscreen_ui.cpp @@ -786,8 +786,7 @@ bool FullscreenUI::AreAnyDialogsOpen() { return (s_state.input_binding_dialog.IsOpen() || ImGuiFullscreen::IsAnyFixedPopupDialogOpen() || ImGuiFullscreen::IsChoiceDialogOpen() || ImGuiFullscreen::IsInputDialogOpen() || - ImGuiFullscreen::IsFileSelectorOpen() || ImGuiFullscreen::IsMessageBoxDialogOpen() || - ImGuiFullscreen::HasToast() || ImGuiFullscreen::HasAnyNotifications()); + ImGuiFullscreen::IsFileSelectorOpen() || ImGuiFullscreen::IsMessageBoxDialogOpen()); } void FullscreenUI::CheckForConfigChanges(const GPUSettings& old_settings) @@ -797,7 +796,8 @@ void FullscreenUI::CheckForConfigChanges(const GPUSettings& old_settings) void FullscreenUI::UpdateRunIdleState() { - const bool new_run_idle = HasActiveWindow(); + const bool new_run_idle = + (HasActiveWindow() || ImGuiFullscreen::HasToast() || ImGuiFullscreen::HasAnyNotifications()); GPUThread::SetRunIdleReason(GPUThread::RunIdleReason::FullscreenUIActive, new_run_idle); } diff --git a/src/duckstation-qt/displaywidget.cpp b/src/duckstation-qt/displaywidget.cpp index d576fe9bc..b40777656 100644 --- a/src/duckstation-qt/displaywidget.cpp +++ b/src/duckstation-qt/displaywidget.cpp @@ -319,7 +319,6 @@ bool DisplayWidget::event(QEvent* event) // don't toggle fullscreen when we're bound.. that wouldn't end well. if (event->type() == QEvent::MouseButtonDblClick && static_cast(event)->button() == Qt::LeftButton && QtHost::IsSystemValid() && - !FullscreenUI::HasActiveWindow() && ((!QtHost::IsSystemPaused() && !m_relative_mouse_enabled && !InputManager::HasAnyBindingsForKey(InputManager::MakePointerButtonKey(0, 0))) || (QtHost::IsSystemPaused() && !ImGuiManager::WantsMouseInput())) &&