From 3095f585dde9c525fbe27af4a663d7009e8fd37f Mon Sep 17 00:00:00 2001 From: Andrew Date: Sat, 24 Jun 2017 20:10:23 -0400 Subject: [PATCH 1/2] Hide mouse cursor after delay in DolphinWX --- Source/Core/DolphinWX/Frame.cpp | 18 ++++++++++++++++++ Source/Core/DolphinWX/Frame.h | 3 +++ Source/Core/DolphinWX/VideoConfigDiag.cpp | 2 +- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 29a7b526c3..ec46436632 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -448,6 +448,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()); @@ -1122,6 +1126,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) { @@ -1699,6 +1710,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()) diff --git a/Source/Core/DolphinWX/Frame.h b/Source/Core/DolphinWX/Frame.h index 094df16173..ed2af79726 100644 --- a/Source/Core/DolphinWX/Frame.h +++ b/Source/Core/DolphinWX/Frame.h @@ -144,6 +144,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; @@ -167,6 +168,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; @@ -360,6 +362,7 @@ private: void PollHotkeys(wxTimerEvent&); void ParseHotkeys(); + void HandleCursorTimer(wxTimerEvent&); void HandleSignal(wxTimerEvent&); bool InitControllers(); diff --git a/Source/Core/DolphinWX/VideoConfigDiag.cpp b/Source/Core/DolphinWX/VideoConfigDiag.cpp index 687bdf7b33..02318ec515 100644 --- a/Source/Core/DolphinWX/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/VideoConfigDiag.cpp @@ -502,7 +502,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 = From d38987e1e80b2221e80f2e1bf469eff6a4ac1c55 Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 4 Jul 2017 10:58:27 -0400 Subject: [PATCH 2/2] Hide mouse cursor after delay in DolphinQt --- Source/Core/DolphinQt2/RenderWidget.cpp | 21 +++++++++++++++++++ Source/Core/DolphinQt2/RenderWidget.h | 6 ++++++ .../DolphinQt2/Settings/InterfacePane.cpp | 2 +- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinQt2/RenderWidget.cpp b/Source/Core/DolphinQt2/RenderWidget.cpp index 3022e00ec2..fc28f92d69 100644 --- a/Source/Core/DolphinQt2/RenderWidget.cpp +++ b/Source/Core/DolphinQt2/RenderWidget.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include +#include #include "DolphinQt2/Host.h" #include "DolphinQt2/RenderWidget.h" @@ -19,9 +20,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() @@ -29,6 +36,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()) @@ -40,6 +53,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; diff --git a/Source/Core/DolphinQt2/RenderWidget.h b/Source/Core/DolphinQt2/RenderWidget.h index 0db0ee4d3c..11fadd348b 100644 --- a/Source/Core/DolphinQt2/RenderWidget.h +++ b/Source/Core/DolphinQt2/RenderWidget.h @@ -7,6 +7,8 @@ #include #include +class QTimer; + class RenderWidget final : public QWidget { Q_OBJECT @@ -24,5 +26,9 @@ signals: void StateChanged(bool fullscreen); private: + void HandleCursorTimer(); void OnHideCursorChanged(); + + static constexpr int MOUSE_HIDE_DELAY = 3000; + QTimer* m_mouse_timer; }; diff --git a/Source/Core/DolphinQt2/Settings/InterfacePane.cpp b/Source/Core/DolphinQt2/Settings/InterfacePane.cpp index 84998ea13d..40b87a7b34 100644 --- a/Source/Core/DolphinQt2/Settings/InterfacePane.cpp +++ b/Source/Core/DolphinQt2/Settings/InterfacePane.cpp @@ -91,7 +91,7 @@ void InterfacePane::CreateInGame() m_checkbox_enable_osd = new QCheckBox(tr("Enable 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);