Merge pull request #5748 from nitrousox1de/hide-mouse-delay-fullscreen

Hide mouse delay fullscreen

Source/Core/DolphinQt2/RenderWidget.cpp

@@ -3,6 +3,7 @@
 // Refer to the license.txt file included.
 
 #include <QKeyEvent>
+#include <QTimer>
 
 #include "DolphinQt2/Host.h"
 #include "DolphinQt2/RenderWidget.h"
@@ -18,9 +19,15 @@ RenderWidget::RenderWidget(QWidget* parent) : QWidget(parent)
   connect(this, &RenderWidget::HandleChanged, Host::GetInstance(), &Host::SetRenderHandle);
   emit HandleChanged((void*)winId());
 
+  m_mouse_timer = new QTimer(this);
+  connect(m_mouse_timer, &QTimer::timeout, this, &RenderWidget::HandleCursorTimer);
+  m_mouse_timer->setSingleShot(true);
+  setMouseTracking(true);
+
   connect(&Settings::Instance(), &Settings::HideCursorChanged, this,
           &RenderWidget::OnHideCursorChanged);
   OnHideCursorChanged();
+  m_mouse_timer->start(MOUSE_HIDE_DELAY);
 }
 
 void RenderWidget::OnHideCursorChanged()
@@ -28,6 +35,12 @@ void RenderWidget::OnHideCursorChanged()
   setCursor(Settings::Instance().GetHideCursor() ? Qt::BlankCursor : Qt::ArrowCursor);
 }
 
+void RenderWidget::HandleCursorTimer()
+{
+  if (isActiveWindow())
+    setCursor(Qt::BlankCursor);
+}
+
 bool RenderWidget::event(QEvent* event)
 {
   switch (event->type())
@@ -39,6 +52,14 @@ bool RenderWidget::event(QEvent* event)
       emit EscapePressed();
     break;
   }
+  case QEvent::MouseMove:
+  case QEvent::MouseButtonPress:
+    if (!Settings::Instance().GetHideCursor() && isActiveWindow())
+    {
+      setCursor(Qt::ArrowCursor);
+      m_mouse_timer->start(MOUSE_HIDE_DELAY);
+    }
+    break;
   case QEvent::WinIdChange:
     emit HandleChanged((void*)winId());
     break;

Source/Core/DolphinQt2/RenderWidget.h

@@ -7,6 +7,8 @@
 #include <QEvent>
 #include <QWidget>
 
+class QTimer;
+
 class RenderWidget final : public QWidget
 {
   Q_OBJECT
@@ -23,5 +25,9 @@ signals:
   void StateChanged(bool fullscreen);
 
 private:
+  void HandleCursorTimer();
   void OnHideCursorChanged();
+
+  static constexpr int MOUSE_HIDE_DELAY = 3000;
+  QTimer* m_mouse_timer;
 };

Source/Core/DolphinQt2/Settings/InterfacePane.cpp

@@ -92,7 +92,7 @@ void InterfacePane::CreateInGame()
   m_checkbox_enable_osd = new QCheckBox(tr("Show On-Screen Messages"));
   m_checkbox_show_active_title = new QCheckBox(tr("Show Active Title in Window Title"));
   m_checkbox_pause_on_focus_lost = new QCheckBox(tr("Pause on Focus Loss"));
-  m_checkbox_hide_mouse = new QCheckBox(tr("Hide Mouse Cursor"));
+  m_checkbox_hide_mouse = new QCheckBox(tr("Always Hide Mouse Cursor"));
 
   groupbox_layout->addWidget(m_checkbox_confirm_on_stop);
   groupbox_layout->addWidget(m_checkbox_use_panic_handlers);

Source/Core/DolphinWX/Frame.cpp

@@ -449,6 +449,10 @@ CFrame::CFrame(wxFrame* parent, wxWindowID id, const wxString& title, wxRect geo
   Bind(wxEVT_TIMER, &CFrame::PollHotkeys, this, m_poll_hotkey_timer.GetId());
   m_poll_hotkey_timer.Start(1000 / 60, wxTIMER_CONTINUOUS);
 
+  m_cursor_timer.SetOwner(this);
+  Bind(wxEVT_TIMER, &CFrame::HandleCursorTimer, this, m_cursor_timer.GetId());
+  m_cursor_timer.StartOnce(MOUSE_HIDE_DELAY);
+
   // Shut down cleanly on SIGINT, SIGTERM (Unix) and on various signals on Windows
   m_handle_signal_timer.SetOwner(this);
   Bind(wxEVT_TIMER, &CFrame::HandleSignal, this, m_handle_signal_timer.GetId());
@@ -1138,6 +1142,13 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
 
 void CFrame::OnMouse(wxMouseEvent& event)
 {
+  if (!SConfig::GetInstance().bHideCursor && main_frame->RendererHasFocus() &&
+      Core::GetState() == Core::State::Running)
+  {
+    m_render_parent->SetCursor(wxNullCursor);
+    m_cursor_timer.StartOnce(MOUSE_HIDE_DELAY);
+  }
+
   // next handlers are all for FreeLook, so we don't need to check them if disabled
   if (!g_Config.bFreeLook)
   {
@@ -1713,6 +1724,13 @@ void CFrame::HandleFrameSkipHotkeys()
   }
 }
 
+void CFrame::HandleCursorTimer(wxTimerEvent& event)
+{
+  if (!SConfig::GetInstance().bHideCursor && main_frame->RendererHasFocus() &&
+      Core::GetState() == Core::State::Running)
+    m_render_parent->SetCursor(wxCURSOR_BLANK);
+}
+
 void CFrame::HandleSignal(wxTimerEvent& event)
 {
   if (!s_shutdown_signal_received.TestAndClear())

Source/Core/DolphinWX/Frame.h

@@ -145,6 +145,7 @@ private:
     ADD_PANE_CENTER
   };
 
+  static constexpr int MOUSE_HIDE_DELAY = 3000;
   GameListCtrl* m_game_list_ctrl = nullptr;
   CConfigMain* m_main_config_dialog = nullptr;
   wxPanel* m_panel = nullptr;
@@ -169,6 +170,7 @@ private:
   int m_save_slot = 1;
 
   wxTimer m_poll_hotkey_timer;
+  wxTimer m_cursor_timer;
   wxTimer m_handle_signal_timer;
 
   wxMenuBar* m_menubar_shadow = nullptr;
@@ -361,6 +363,7 @@ private:
 
   void PollHotkeys(wxTimerEvent&);
   void ParseHotkeys();
+  void HandleCursorTimer(wxTimerEvent&);
   void HandleSignal(wxTimerEvent&);
 
   bool InitControllers();

Source/Core/DolphinWX/VideoConfigDiag.cpp

@@ -458,7 +458,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string& title)
         szr_other->Add(CreateCheckBoxRefBool(page_general, _("Keep Window on Top"),
                                              wxGetTranslation(keep_window_on_top_desc),
                                              SConfig::GetInstance().bKeepWindowOnTop));
-        szr_other->Add(CreateCheckBoxRefBool(page_general, _("Hide Mouse Cursor"),
+        szr_other->Add(CreateCheckBoxRefBool(page_general, _("Always Hide Mouse Cursor"),
                                              wxGetTranslation(hide_mouse_cursor_desc),
                                              SConfig::GetInstance().bHideCursor));
         szr_other->Add(render_to_main_checkbox =