mirror of
https://github.com/stenzek/duckstation.git
synced 2025-06-07 03:55:33 +00:00
Qt: Fix double-click-fullscreen with notifications up
This commit is contained in:
parent
f05c627e48
commit
46ae1780c5
@ -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);
|
||||
}
|
||||
|
||||
|
@ -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<const QMouseEvent*>(event)->button() == Qt::LeftButton && QtHost::IsSystemValid() &&
|
||||
!FullscreenUI::HasActiveWindow() &&
|
||||
((!QtHost::IsSystemPaused() && !m_relative_mouse_enabled &&
|
||||
!InputManager::HasAnyBindingsForKey(InputManager::MakePointerButtonKey(0, 0))) ||
|
||||
(QtHost::IsSystemPaused() && !ImGuiManager::WantsMouseInput())) &&
|
||||
|
Loading…
x
Reference in New Issue
Block a user