ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

D3D: Allow borderless fullscreen to be turned on/off during gameplay.

This commit is contained in:
Jules Blok 2015-01-17 13:49:02 +01:00
parent 803bea5004
commit b87fddb027
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1398,8 +1398,7 @@ void CFrame::DoFullscreen(bool enable_fullscreen)
m_RenderFrame->Raise(); m_RenderFrame->Raise();
} }
g_Config.bFullscreen = (!g_Config.ExclusiveFullscreenEnabled() || g_Config.bFullscreen = enable_fullscreen;
SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain) ? false : enable_fullscreen;
} }
const CGameListCtrl *CFrame::GetGameListCtrl() const const CGameListCtrl *CFrame::GetGameListCtrl() const

6
Source/Core/VideoBackends/D3D/Render.cpp
View File

@ -862,7 +862,7 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, co
SetWindowSize(fbStride, fbHeight); SetWindowSize(fbStride, fbHeight);
const bool windowResized = CheckForResize(); const bool windowResized = CheckForResize();
const bool fullscreen = g_ActiveConfig.bFullscreen && const bool fullscreen = g_ActiveConfig.bFullscreen && !g_ActiveConfig.bBorderlessFullscreen &&
!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain; !SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain;
bool xfbchanged = s_last_xfb_mode != g_ActiveConfig.bUseRealXFB; 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); D3D::SetFullscreenState(fullscreen);
// If exclusive fullscreen is disabled we can safely notify the UI to exit fullscreen. // If fullscreen is disabled we can safely notify the UI to exit fullscreen.
if (!fullscreen) if (!g_ActiveConfig.bFullscreen)
Host_RequestFullscreen(false); Host_RequestFullscreen(false);
} }