mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-10 03:44:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DolphinWX: Move fullscreen switch to after startup is complete

Browse Source 
This means that any error messages won't be hidden by the fullscreen
window.
This commit is contained in:
Stenzek 2018-01-26 15:15:35 +10:00
parent c790077c13
commit 505d30be3d
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -761,6 +761,8 @@ void CFrame::OnHostMessage(wxCommandEvent& event)
case WM_USER_CREATE: case WM_USER_CREATE:
if (SConfig::GetInstance().bHideCursor) if (SConfig::GetInstance().bHideCursor)
m_render_parent->SetCursor(wxCURSOR_BLANK); m_render_parent->SetCursor(wxCURSOR_BLANK);
if (SConfig::GetInstance().bFullscreen)
DoFullscreen(true);
break; break;
case IDM_PANIC: case IDM_PANIC:

6
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -717,6 +717,7 @@ void CFrame::StartGame(std::unique_ptr<BootParameters> boot)
m_render_parent = new wxPanel(m_render_frame, IDM_MPANEL, wxDefaultPosition, wxDefaultSize, 0); m_render_parent = new wxPanel(m_render_frame, IDM_MPANEL, wxDefaultPosition, wxDefaultSize, 0);
#endif #endif
m_render_frame->Show(); m_render_frame->Show();
m_render_frame->Raise();
} }
#if defined(__APPLE__) #if defined(__APPLE__)
@ -724,15 +725,10 @@ void CFrame::StartGame(std::unique_ptr<BootParameters> boot)
#endif #endif
wxBusyCursor hourglass; wxBusyCursor hourglass;
DoFullscreen(SConfig::GetInstance().bFullscreen);
SetDebuggerStartupParameters(); SetDebuggerStartupParameters();
if (!BootManager::BootCore(std::move(boot))) if (!BootManager::BootCore(std::move(boot)))
{ {
DoFullscreen(false);
// Destroy the renderer frame when not rendering to main // Destroy the renderer frame when not rendering to main
if (!SConfig::GetInstance().bRenderToMain) if (!SConfig::GetInstance().bRenderToMain)
m_render_frame->Destroy(); m_render_frame->Destroy();