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

Hide mouse delay fullscreen
This commit is contained in:
Leo Lam
2017-08-11 17:34:46 +08:00
committed by GitHub
6 changed files with 50 additions and 2 deletions

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