The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-27 08:15:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace BorderlessFullscreenEnabled by ExclusiveFullscreenEnabled.

Browse Source 
Special handling was associated with this function, which only applies to exclusive fullscreen.
This commit is contained in:
Jules Blok 2014-10-07 16:43:32 +02:00
parent 85086e1e6c
commit 7344f752b7
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -1104,7 +1104,7 @@ void CFrame::DoStop()
// If exclusive fullscreen is not enabled then we can pause the emulation // If exclusive fullscreen is not enabled then we can pause the emulation
// before we've exited fullscreen. If not then we need to exit fullscreen first. // before we've exited fullscreen. If not then we need to exit fullscreen first.
if (!RendererIsFullscreen() || g_Config.BorderlessFullscreenEnabled() || if (!RendererIsFullscreen() || !g_Config.ExclusiveFullscreenEnabled() ||
SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain) SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain)
{ {
Core::SetState(Core::CORE_PAUSE); Core::SetState(Core::CORE_PAUSE);

2
Source/Core/VideoCommon/VideoConfig.h
View File

@ -151,7 +151,7 @@ struct VideoConfig final
bool VirtualXFBEnabled() const { return bUseXFB && !bUseRealXFB; } bool VirtualXFBEnabled() const { return bUseXFB && !bUseRealXFB; }
bool EFBCopiesToTextureEnabled() const { return bEFBCopyEnable && bCopyEFBToTexture; } bool EFBCopiesToTextureEnabled() const { return bEFBCopyEnable && bCopyEFBToTexture; }
bool EFBCopiesToRamEnabled() const { return bEFBCopyEnable && !bCopyEFBToTexture; } bool EFBCopiesToRamEnabled() const { return bEFBCopyEnable && !bCopyEFBToTexture; }
bool BorderlessFullscreenEnabled() const { return !backend_info.bSupportsExclusiveFullscreen || bBorderlessFullscreen; } bool ExclusiveFullscreenEnabled() const { return backend_info.bSupportsExclusiveFullscreen && !bBorderlessFullscreen; }
}; };
extern VideoConfig g_Config; extern VideoConfig g_Config;