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

Frame: Fix RendererHasFocus

Browse Source 
The logic of RendererHasFocus was extremely convoluted beforehand and
was too brittle and broke in certain circumstances, like when the
GCPad window was active. Simplify it and leave a comment explaining the
new logic. This fixes the GCPad window not working when Background Input
is unchecked.
This commit is contained in:
Jasper St. Pierre
2014-07-12 07:29:49 -04:00
parent e4eec2002b
commit ff918df889
1 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -753,24 +753,15 @@ void CFrame::OnRenderWindowSizeRequest(int width, int height)
bool CFrame::RendererHasFocus() bool CFrame::RendererHasFocus()
{ {
if (m_RenderParent == nullptr) // RendererHasFocus should return true any time any one of our
return false; // windows has the focus, including any dialogs or other windows.
#ifdef _WIN32 //
if (m_RenderParent->GetParent()->GetHWND() == GetForegroundWindow()) // wxGetActiveWindow() returns the current wxWindow which has
return true; // focus. If it's not one of our windows, then it will return
#else // null.
wxWindow *window = wxWindow::FindFocus();
if (window == nullptr) wxWindow *focusWindow = wxGetActiveWindow();
return false; return (focusWindow != nullptr);
// Why these different cases?
if (m_RenderParent == window ||
m_RenderParent == window->GetParent() ||
m_RenderParent->GetParent() == window->GetParent())
{
return true;
}
#endif
return false;
} }
void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED (event)) void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED (event))