Qt: Remove HasAnyBindingsForKey() call on double click

Author: stenzek

src/duckstation-qt/displaywidget.cpp

@@ -85,6 +85,11 @@ void DisplayWidget::clearWindowInfo()
   m_window_info.reset();
 }
 
+void DisplayWidget::setIgnoreDoubleClick(bool enabled)
+{
+  m_ignore_double_click = enabled;
+}
+
 void DisplayWidget::checkForSizeChange(bool update_refresh_rate)
 {
   if (!m_window_info.has_value())
@@ -368,8 +373,7 @@ bool DisplayWidget::event(QEvent* event)
 
       // don't toggle fullscreen when we're bound.. that wouldn't end well.
       if (static_cast<const QMouseEvent*>(event)->button() == Qt::LeftButton && QtHost::IsSystemValid() &&
-          ((!QtHost::IsSystemPaused() && !m_relative_mouse_enabled &&
-            !InputManager::HasAnyBindingsForKey(InputManager::MakePointerButtonKey(0, 0))) ||
+          ((!QtHost::IsSystemPaused() && !m_relative_mouse_enabled && !m_ignore_double_click) ||
            (QtHost::IsSystemPaused() && !ImGuiManager::WantsMouseInput())) &&
           Core::GetBoolSettingValue("Main", "DoubleClickTogglesFullscreen", true))
       {

src/duckstation-qt/displaywidget.h

@@ -36,6 +36,7 @@ class DisplayWidget final : public QWidget
 
   void updateRelativeMode(bool enabled);
   void updateCursor(bool hidden);
+  void setIgnoreDoubleClick(bool enabled);
 
   void checkForSizeChange(bool update_refresh_rate);
   void handleCloseEvent(QCloseEvent* event);
@@ -69,6 +70,7 @@ class DisplayWidget final : public QWidget
 #endif
   bool m_cursor_hidden = false;
   bool m_destroying = false;
+  bool m_ignore_double_click = false;
   bool m_screen_change_registered = false;
 
   RenderAPI m_render_api = RenderAPI::None;

src/duckstation-qt/mainwindow.cpp

@@ -493,6 +493,7 @@ void MainWindow::updateDisplayWidgetCursor()
 
   m_display_widget->updateRelativeMode(s_locals.system_valid && !s_locals.system_paused && m_relative_mouse_mode);
   m_display_widget->updateCursor(s_locals.system_valid && !s_locals.system_paused && shouldHideMouseCursor());
+  m_display_widget->setIgnoreDoubleClick(m_ignore_double_click);
 }
 
 void MainWindow::updateDisplayRelatedActions()
@@ -567,10 +568,11 @@ QWidget* MainWindow::getDisplayContainer() const
   return (m_display_container ? static_cast<QWidget*>(m_display_container) : static_cast<QWidget*>(m_display_widget));
 }
 
-void MainWindow::onMouseModeRequested(bool relative_mode, bool hide_cursor)
+void MainWindow::onMouseModeRequested(bool relative_mode, bool hide_cursor, bool ignore_double_click)
 {
   m_relative_mouse_mode = relative_mode;
   m_hide_mouse_cursor = hide_cursor;
+  m_ignore_double_click = ignore_double_click;
   updateDisplayWidgetCursor();
 }
 

src/duckstation-qt/mainwindow.h

@@ -234,7 +234,7 @@ class MainWindow final : public QMainWindow
                                                 Error* error);
   void displayResizeRequested(qint32 width, qint32 height);
   void releaseRenderWindow();
-  void onMouseModeRequested(bool relative_mode, bool hide_cursor);
+  void onMouseModeRequested(bool relative_mode, bool hide_cursor, bool ignore_double_click);
 
   void onSettingsResetToDefault(bool system, bool controller);
   void onSystemStarting();
@@ -359,6 +359,7 @@ class MainWindow final : public QMainWindow
 
   bool m_relative_mouse_mode = false;
   bool m_hide_mouse_cursor = false;
+  bool m_ignore_double_click = false;
 
   bool m_exclusive_fullscreen_requested = false;
   bool m_was_paused_on_game_list_switch = false;

src/duckstation-qt/qthost.cpp

@@ -3214,7 +3214,9 @@ void Host::OnMediaCaptureStopped()
 
 void Host::SetMouseMode(bool relative, bool hide_cursor)
 {
-  emit g_core_thread->mouseModeRequested(relative, hide_cursor);
+  // Disable double-click handling when mouse is bound.
+  const bool ignore_double_click = InputManager::HasAnyBindingsForKey(InputManager::MakePointerButtonKey(0, 0));
+  emit g_core_thread->mouseModeRequested(relative, hide_cursor, ignore_double_click);
 }
 
 void Host::PumpMessagesOnCoreThread()

src/duckstation-qt/qthost.h

@@ -119,7 +119,7 @@ class CoreThread : public QThread
   void onResizeRenderWindowRequested(qint32 width, qint32 height);
   void onReleaseRenderWindowRequested();
   void inputProfileLoaded();
-  void mouseModeRequested(bool relative, bool hide_cursor);
+  void mouseModeRequested(bool relative, bool hide_cursor, bool ignore_double_click);
   void fullscreenUIStartedOrStopped(bool running);
   void achievementsLoginRequested(Achievements::LoginRequestReason reason);
   void achievementsLoginSuccess(const QString& username, quint32 points, quint32 sc_points, quint32 unread_messages);

src/util/input_manager.cpp

@@ -1123,7 +1123,7 @@ void InputManager::SynchronizePadEffectBindings(InputBindingKey key)
 
 bool InputManager::HasAnyBindingsForKey(InputBindingKey key)
 {
-  // DebugAssert(Host::IsOnCoreThread());
+  DebugAssert(Host::IsOnCoreThread());
 
   std::unique_lock lock(s_state.mutex);
   return (s_state.binding_map.find(key.MaskDirection()) != s_state.binding_map.end());