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 interacting with pause menu after double-click-fullscreen

Browse Source
This commit is contained in:
Stenzek 2025-04-05 15:01:37 +10:00
parent 47e941cdc2
commit 64fac4c9d4
No known key found for this signature in database
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -307,7 +307,6 @@ bool DisplayWidget::event(QEvent* event)
} }
case QEvent::MouseButtonPress: case QEvent::MouseButtonPress:
case QEvent::MouseButtonDblClick:
case QEvent::MouseButtonRelease: case QEvent::MouseButtonRelease:
{ {
if (!m_relative_mouse_enabled || !InputManager::IsUsingRawInput()) if (!m_relative_mouse_enabled || !InputManager::IsUsingRawInput())
@ -316,9 +315,22 @@ bool DisplayWidget::event(QEvent* event)
emit windowMouseButtonEvent(static_cast<int>(button_index), event->type() != QEvent::MouseButtonRelease); emit windowMouseButtonEvent(static_cast<int>(button_index), event->type() != QEvent::MouseButtonRelease);
} }
return true;
}
case QEvent::MouseButtonDblClick:
{
// since we don't get press and release events for double-click, we need to send both the down and up
// otherwise the second click in a double click won't be registered by the input system
if (!m_relative_mouse_enabled || !InputManager::IsUsingRawInput())
{
const u32 button_index = CountTrailingZeros(static_cast<u32>(static_cast<const QMouseEvent*>(event)->button()));
emit windowMouseButtonEvent(static_cast<int>(button_index), true);
emit windowMouseButtonEvent(static_cast<int>(button_index), false);
}
// 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 (static_cast<const QMouseEvent*>(event)->button() == Qt::LeftButton && QtHost::IsSystemValid() &&
static_cast<const QMouseEvent*>(event)->button() == Qt::LeftButton && QtHost::IsSystemValid() &&
((!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())) &&