mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 20:28:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

VideoConfig: Ignore Borderless Fullscreen setting when the backend does not support exclusive fullscreen.

Browse source 
This was expected to be handled by VerifyValidity(), but that only verifies the validity of the INI files.
This commit is contained in:
Jules Blok 2014-07-28 23:26:40 +02:00
commit 3b5625c76b
4 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Source/Core/DolphinWX/Frame.cpp
View file

@ -1189,7 +1189,7 @@ void CFrame::OnMouse(wxMouseEvent& event)
void CFrame::DoFullscreen(bool enable_fullscreen)
{
if (!g_Config.bBorderlessFullscreen &&
if (!g_Config.BorderlessFullscreenEnabled() &&
!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain &&
Core::GetState() == Core::CORE_PAUSE)
{
@ -1216,7 +1216,7 @@ void CFrame::DoFullscreen(bool enable_fullscreen)
{
m_RenderFrame->ShowFullScreen(true, wxFULLSCREEN_ALL);
}
else if (g_Config.bBorderlessFullscreen ||
else if (g_Config.BorderlessFullscreenEnabled() ||
SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain)
{
// Exiting exclusive fullscreen should be done from a Renderer callback.
@ -1244,7 +1244,7 @@ void CFrame::DoFullscreen(bool enable_fullscreen)
m_RenderFrame->Raise();
}
g_Config.bFullscreen = (g_Config.bBorderlessFullscreen ||
g_Config.bFullscreen = (g_Config.BorderlessFullscreenEnabled() ||
SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain) ? false : enable_fullscreen;
}