diff options
| author | Jules Blok <jules.blok@gmail.com> | 2015-01-18 04:35:08 +0100 |
|---|---|---|
| committer | Jules Blok <jules.blok@gmail.com> | 2015-01-19 22:55:21 +0100 |
| commit | 332d5888eb612107576c3ecba7daa1aab46a3cf6 (patch) | |
| tree | 8500eb4e153445ff0a9845467e9607c2b78df0ac /Source/Core/DolphinWX/Frame.cpp | |
| parent | 8d69658a9da53f531f01c7f8a54d7b8db80f6098 (diff) | |
VideoConfig: Add exclusive mode flag.
Allows the UI to easily check the current exclusive mode state.
This simplifies a few checks and prevents the user from ever getting stuck in fullscreen.
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 662739863c..d90db5a28d 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -1319,13 +1319,11 @@ void CFrame::OnMouse(wxMouseEvent& event) void CFrame::DoFullscreen(bool enable_fullscreen) { - if (g_Config.ExclusiveFullscreenEnabled() && - !SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain && - Core::GetState() == Core::CORE_PAUSE) + if (g_Config.bExclusiveMode && Core::GetState() == Core::CORE_PAUSE) { // A responsive renderer is required for exclusive fullscreen, but the // renderer can only respond in the running state. Therefore we ignore - // fullscreen switches if we support exclusive fullscreen, but the + // fullscreen switches if we are in exclusive fullscreen, but the // renderer is not running. // TODO: Allow the renderer to switch fullscreen modes while paused. return; @@ -1346,11 +1344,10 @@ void CFrame::DoFullscreen(bool enable_fullscreen) { m_RenderFrame->ShowFullScreen(true, wxFULLSCREEN_ALL); } - else if (!g_Config.ExclusiveFullscreenEnabled() || - SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain) + else if (!g_Config.bExclusiveMode) { // Exiting exclusive fullscreen should be done from a Renderer callback. - // Therefore we don't exit fullscreen from here if we support exclusive mode. + // Therefore we don't exit fullscreen from here if we are in exclusive mode. m_RenderFrame->ShowFullScreen(false, wxFULLSCREEN_ALL); } #endif |