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

Move UiHasFocus into DolphinApp

Browse Source 
Using a wxEVT_ACTIVATE_APP event.
This commit is contained in:
aldelaro5
2016-10-27 21:50:09 -04:00
parent 2005b4430f
commit ee201455a8
4 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -504,10 +504,10 @@ void CFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
// Events
void CFrame::OnActive(wxActivateEvent& event)
{
m_bHasFocus = (event.GetActive() && event.GetEventObject() == m_RenderFrame);
m_bRendererHasFocus = (event.GetActive() && event.GetEventObject() == m_RenderFrame);
if (Core::GetState() == Core::CORE_RUN || Core::GetState() == Core::CORE_PAUSE)
{
if (m_bHasFocus)
if (m_bRendererHasFocus)
{
if (SConfig::GetInstance().bRenderToMain)
m_RenderParent->SetFocus();
@ -779,20 +779,6 @@ bool CFrame::RendererHasFocus()
return m_bRendererHasFocus;
}
// Returns true any time any one of our UI windows
// has the focus, including any dialogs or other windows.
bool CFrame::UIHasFocus()
{
// UIHasFocus should return true any time any one of our UI
// windows has the focus, including any dialogs or other windows.
//
// wxWindow::FindFocus() returns the current wxWindow which has
// focus. If it's not one of our windows, then it will return
// null.
return m_bHasFocus;
}
void CFrame::OnGameListCtrlItemActivated(wxListEvent& WXUNUSED(event))
{
// Show all platforms and regions if...