github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-06-07 03:55:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix double-click-fullscreen with notifications up

Browse Source
This commit is contained in:
Stenzek 2025-04-05 14:32:09 +10:00
parent f05c627e48
commit 46ae1780c5
No known key found for this signature in database
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/fullscreen_ui.cpp
View File

@ -786,8 +786,7 @@ bool FullscreenUI::AreAnyDialogsOpen()
{ {
return (s_state.input_binding_dialog.IsOpen() || ImGuiFullscreen::IsAnyFixedPopupDialogOpen() || return (s_state.input_binding_dialog.IsOpen() || ImGuiFullscreen::IsAnyFixedPopupDialogOpen() ||
ImGuiFullscreen::IsChoiceDialogOpen() || ImGuiFullscreen::IsInputDialogOpen() || ImGuiFullscreen::IsChoiceDialogOpen() || ImGuiFullscreen::IsInputDialogOpen() ||
ImGuiFullscreen::IsFileSelectorOpen() || ImGuiFullscreen::IsMessageBoxDialogOpen() || ImGuiFullscreen::IsFileSelectorOpen() || ImGuiFullscreen::IsMessageBoxDialogOpen());
ImGuiFullscreen::HasToast() || ImGuiFullscreen::HasAnyNotifications());
} }
void FullscreenUI::CheckForConfigChanges(const GPUSettings& old_settings) void FullscreenUI::CheckForConfigChanges(const GPUSettings& old_settings)
@ -797,7 +796,8 @@ void FullscreenUI::CheckForConfigChanges(const GPUSettings& old_settings)
void FullscreenUI::UpdateRunIdleState() 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); GPUThread::SetRunIdleReason(GPUThread::RunIdleReason::FullscreenUIActive, new_run_idle);
} }

1
src/duckstation-qt/displaywidget.cpp
View File

@ -319,7 +319,6 @@ bool DisplayWidget::event(QEvent* event)
// don't toggle fullscreen when we're bound.. that wouldn't end well. // don't toggle fullscreen when we're bound.. that wouldn't end well.
if (event->type() == QEvent::MouseButtonDblClick && if (event->type() == QEvent::MouseButtonDblClick &&
static_cast<const QMouseEvent*>(event)->button() == Qt::LeftButton && QtHost::IsSystemValid() && static_cast<const QMouseEvent*>(event)->button() == Qt::LeftButton && QtHost::IsSystemValid() &&
!FullscreenUI::HasActiveWindow() &&
((!QtHost::IsSystemPaused() && !m_relative_mouse_enabled && ((!QtHost::IsSystemPaused() && !m_relative_mouse_enabled &&
!InputManager::HasAnyBindingsForKey(InputManager::MakePointerButtonKey(0, 0))) || !InputManager::HasAnyBindingsForKey(InputManager::MakePointerButtonKey(0, 0))) ||
(QtHost::IsSystemPaused() && !ImGuiManager::WantsMouseInput())) && (QtHost::IsSystemPaused() && !ImGuiManager::WantsMouseInput())) &&