mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 14:19:46 -06:00
Move UiHasFocus into DolphinApp
Using a wxEVT_ACTIVATE_APP event.
This commit is contained in:
@ -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...
|
||||
|
Reference in New Issue
Block a user