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

Frame: Use PauseAndLock when switching fullscreen modes.

Browse Source 
This allows us to regain exclusive mode directly from OnActive().
This commit is contained in:
Jules Blok
2016-11-09 01:41:38 +01:00
parent 9909babe2c
commit d7cf5e28b6
4 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -525,6 +525,16 @@ void CFrame::OnActive(wxActivateEvent& event)
{
if (SConfig::GetInstance().bRenderToMain)
m_RenderParent->SetFocus();
else if (RendererIsFullscreen() && g_ActiveConfig.ExclusiveFullscreenEnabled())
{
// Regain exclusive mode if it was lost due to a focus change.
if (g_renderer && !g_renderer->IsFullscreen())
{
bool was_unpaused = Core::PauseAndLock(true);
g_renderer->SetFullscreen(true);
Core::PauseAndLock(false, was_unpaused);
}
}
if (SConfig::GetInstance().m_PauseOnFocusLost && Core::GetState() == Core::CORE_PAUSE)
DoPause();
@ -1118,13 +1128,10 @@ void CFrame::DoFullscreen(bool enable_fullscreen)
{
ToggleDisplayMode(enable_fullscreen);
if (!enable_fullscreen && g_renderer)
g_renderer->SetFullscreen(false);
m_RenderFrame->ShowFullScreen(enable_fullscreen, wxFULLSCREEN_ALL);
if (SConfig::GetInstance().bRenderToMain)
{
m_RenderFrame->ShowFullScreen(enable_fullscreen, wxFULLSCREEN_ALL);
if (enable_fullscreen)
{
// Save the current mode before going to fullscreen
@ -1166,12 +1173,29 @@ void CFrame::DoFullscreen(bool enable_fullscreen)
}
}
}
else
else if (g_ActiveConfig.ExclusiveFullscreenEnabled())
{
if (g_renderer && !enable_fullscreen)
{
bool was_unpaused = Core::PauseAndLock(true);
g_renderer->SetFullscreen(false);
Core::PauseAndLock(false, was_unpaused);
}
m_RenderFrame->ShowFullScreen(enable_fullscreen, wxFULLSCREEN_ALL);
m_RenderFrame->Raise();
if (enable_fullscreen && g_renderer)
if (g_renderer && enable_fullscreen)
{
bool was_unpaused = Core::PauseAndLock(true);
g_renderer->SetFullscreen(true);
Core::PauseAndLock(false, was_unpaused);
}
}
else
{
m_RenderFrame->ShowFullScreen(enable_fullscreen, wxFULLSCREEN_ALL);
m_RenderFrame->Raise();
}
}