feedc0de/dolphin
1
0
Fork 0
forked from dolphin-emu/dolphin
Code Pull Requests Activity

Merge pull request #4394 from aldelaro5/fix-focus-detection-linux

Browse Source 
Fix window focus detection on Linux (rebase from #3843)
This commit is contained in:
Anthony
2016-10-29 00:35:18 -05:00
committed by GitHub
parent 26902d89e8 ee201455a8
commit 41563c55cd
5 changed files with 22 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/DolphinWX/FrameTools.cpp
+2 -2
View File
@@ -735,8 +735,6 @@ void CFrame::StartGame(const std::string& filename)
wxTheApp->Bind(wxEVT_MIDDLE_DOWN, &CFrame::OnMouse, this);
wxTheApp->Bind(wxEVT_MIDDLE_UP, &CFrame::OnMouse, this);
wxTheApp->Bind(wxEVT_MOTION, &CFrame::OnMouse, this);
wxTheApp->Bind(wxEVT_SET_FOCUS, &CFrame::OnFocusChange, this);
wxTheApp->Bind(wxEVT_KILL_FOCUS, &CFrame::OnFocusChange, this);
m_RenderParent->Bind(wxEVT_SIZE, &CFrame::OnRenderParentResize, this);
}
}
@@ -928,6 +926,8 @@ void CFrame::OnStopped()
m_RenderFrame->SetWindowStyle(m_RenderFrame->GetWindowStyle() & ~wxSTAY_ON_TOP);
}
m_RenderParent = nullptr;
m_bRendererHasFocus = false;
m_RenderFrame = nullptr;
// Clean framerate indications from the status bar.
GetStatusBar()->SetStatusText(" ", 0);