Yaya48/dolphin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #690 from Armada651/d3dfullscreen_fixes

Browse Source 
Exclusive fullscreen fixes
This commit is contained in:
Pierre Bourdon
2014-07-30 16:28:56 -07:00
parent 5516b0382c 3b5625c76b
commit 83838a645f
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/DolphinWX/Frame.cpp
+5 -4
View File
@@ -450,7 +450,7 @@ bool CFrame::RendererIsFullscreen()
if (Core::GetState() == Core::CORE_RUN || Core::GetState() == Core::CORE_PAUSE)
{
fullscreen = m_RenderFrame->IsFullScreen() && g_Config.bFullscreen;
fullscreen = m_RenderFrame->IsFullScreen();
}
#if defined(__APPLE__)
@@ -1189,7 +1189,7 @@ void CFrame::OnMouse(wxMouseEvent& event)
void CFrame::DoFullscreen(bool enable_fullscreen)
{
if (!g_Config.bBorderlessFullscreen &&
if (!g_Config.BorderlessFullscreenEnabled() &&
!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain &&
Core::GetState() == Core::CORE_PAUSE)
{
@@ -1216,7 +1216,7 @@ void CFrame::DoFullscreen(bool enable_fullscreen)
{
m_RenderFrame->ShowFullScreen(true, wxFULLSCREEN_ALL);
}
else if (g_Config.bBorderlessFullscreen ||
else if (g_Config.BorderlessFullscreenEnabled() ||
SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain)
{
// Exiting exclusive fullscreen should be done from a Renderer callback.
@@ -1244,7 +1244,8 @@ void CFrame::DoFullscreen(bool enable_fullscreen)
m_RenderFrame->Raise();
}
g_Config.bFullscreen = enable_fullscreen;
g_Config.bFullscreen = (g_Config.BorderlessFullscreenEnabled() ||
SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain) ? false : enable_fullscreen;
}
const CGameListCtrl *CFrame::GetGameListCtrl() const
Source/Core/DolphinWX/FrameTools.cpp
+1 -1
View File
@@ -1104,7 +1104,7 @@ void CFrame::DoStop()
// 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.
if (!RendererIsFullscreen() || g_Config.bBorderlessFullscreen ||
if (!RendererIsFullscreen() || g_Config.BorderlessFullscreenEnabled() ||
SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain)
{
Core::SetState(Core::CORE_PAUSE);