Skip to content

Commit

Permalink
Merge pull request #6098 from aleios/master
Browse files Browse the repository at this point in the history
WX: Reshow cursor after game termination (issue 10503)
  • Loading branch information
leoetlino committed Oct 5, 2017
2 parents 7d47b02 + 6d04d4b commit 5f0de43
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion Source/Core/DolphinWX/FrameTools.cpp
Expand Up @@ -711,7 +711,6 @@ void CFrame::StartGame(std::unique_ptr<BootParameters> boot)
// To capture key events on Linux and Mac OS X the frame needs at least one child.
m_render_parent = new wxPanel(m_render_frame, IDM_MPANEL, wxDefaultPosition, wxDefaultSize, 0);
#endif

m_render_frame->Show();
}

Expand Down Expand Up @@ -760,6 +759,8 @@ void CFrame::StartGame(std::unique_ptr<BootParameters> boot)
wxTheApp->Bind(wxEVT_MIDDLE_UP, &CFrame::OnMouse, this);
wxTheApp->Bind(wxEVT_MOTION, &CFrame::OnMouse, this);
m_render_parent->Bind(wxEVT_SIZE, &CFrame::OnRenderParentResize, this);

m_render_parent->SetCursor(wxCURSOR_BLANK);
}
}

Expand Down Expand Up @@ -910,6 +911,9 @@ void CFrame::DoStop()
return;
}

// Reshow the cursor on the parent frame after successful stop.
m_render_parent->SetCursor(wxNullCursor);

Core::Stop();
UpdateGUI();
}
Expand Down

0 comments on commit 5f0de43

Please sign in to comment.