diff options
| author | Jules Blok <jules.blok@gmail.com> | 2014-10-07 16:43:32 +0200 |
|---|---|---|
| committer | Jules Blok <jules.blok@gmail.com> | 2014-10-07 16:43:32 +0200 |
| commit | 7344f752b7d6e78e2c48069a0476076a7e2f0b22 (patch) | |
| tree | 40bf5f6f4f4b5db34353ef5d7be5d3a976dd9755 /Source/Core/DolphinWX/Frame.cpp | |
| parent | 85086e1e6c313c35f8d2971096f9766177241fa5 (diff) | |
Replace BorderlessFullscreenEnabled by ExclusiveFullscreenEnabled.
Special handling was associated with this function, which only applies to exclusive fullscreen.
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index bd98c974ca..c33ebf5e3c 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -1251,7 +1251,7 @@ void CFrame::OnMouse(wxMouseEvent& event) void CFrame::DoFullscreen(bool enable_fullscreen) { - if (!g_Config.BorderlessFullscreenEnabled() && + if (g_Config.ExclusiveFullscreenEnabled() && !SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain && Core::GetState() == Core::CORE_PAUSE) { @@ -1278,7 +1278,7 @@ void CFrame::DoFullscreen(bool enable_fullscreen) { m_RenderFrame->ShowFullScreen(true, wxFULLSCREEN_ALL); } - else if (g_Config.BorderlessFullscreenEnabled() || + else if (!g_Config.ExclusiveFullscreenEnabled() || SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain) { // Exiting exclusive fullscreen should be done from a Renderer callback. @@ -1335,7 +1335,7 @@ void CFrame::DoFullscreen(bool enable_fullscreen) m_RenderFrame->Raise(); } - g_Config.bFullscreen = (g_Config.BorderlessFullscreenEnabled() || + g_Config.bFullscreen = (!g_Config.ExclusiveFullscreenEnabled() || SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain) ? false : enable_fullscreen; } |