piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-30 01:29:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Hide mouse delay fullscreen
This commit is contained in:
Leo Lam
2017-08-11 17:34:46 +08:00
committed by GitHub
parent 54778303ee d38987e1e8
commit 438610a58d
6 changed files with 50 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/DolphinWX/Frame.cpp
View File

@ -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())

3
Source/Core/DolphinWX/Frame.h
View File

@ -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();

2
Source/Core/DolphinWX/VideoConfigDiag.cpp
View File

@ -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 =