diff options
| author | Jules Blok <jules.blok@gmail.com> | 2015-01-17 13:49:02 +0100 |
|---|---|---|
| committer | Jules Blok <jules.blok@gmail.com> | 2015-01-17 16:11:12 +0100 |
| commit | b87fddb0279bf40fb75f4f6b462d9db8ee113916 (patch) | |
| tree | 8215372b6b31d99eb3d5dddee36a0847008f6348 /Source/Core/VideoBackends/D3D/Render.cpp | |
| parent | 803bea500450799ed8a3069ac680ece9bf661344 (diff) | |
D3D: Allow borderless fullscreen to be turned on/off during gameplay.
Diffstat (limited to 'Source/Core/VideoBackends/D3D/Render.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/Render.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp index b960504c2c..cafe189115 100644 --- a/Source/Core/VideoBackends/D3D/Render.cpp +++ b/Source/Core/VideoBackends/D3D/Render.cpp @@ -862,7 +862,7 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, co SetWindowSize(fbStride, fbHeight); const bool windowResized = CheckForResize(); - const bool fullscreen = g_ActiveConfig.bFullscreen && + const bool fullscreen = g_ActiveConfig.bFullscreen && !g_ActiveConfig.bBorderlessFullscreen && !SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain; bool xfbchanged = s_last_xfb_mode != g_ActiveConfig.bUseRealXFB; @@ -917,8 +917,8 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, co { D3D::SetFullscreenState(fullscreen); - // If exclusive fullscreen is disabled we can safely notify the UI to exit fullscreen. - if (!fullscreen) + // If fullscreen is disabled we can safely notify the UI to exit fullscreen. + if (!g_ActiveConfig.bFullscreen) Host_RequestFullscreen(false); } |
