Merge pull request #6745 from spycrab/qt_fullscreen

Qt: Call Render::SetFullscreen
dolphin-emu · May 3, 2018 · be32602 · be32602
2 parents 47fe1c8 + 68e2b46
commit be32602
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/Source/Core/DolphinQt2/Host.cpp b/Source/Core/DolphinQt2/Host.cpp
@@ -16,6 +16,7 @@
 #include "Core/PowerPC/PowerPC.h"
 #include "DolphinQt2/Settings.h"
 #include "VideoCommon/RenderBase.h"
+#include "VideoCommon/VideoConfig.h"
 
 Host::Host() = default;
 
@@ -43,6 +44,8 @@ bool Host::GetRenderFocus()
 void Host::SetRenderFocus(bool focus)
 {
   m_render_focus = focus;
+  if (g_renderer && m_render_fullscreen && g_ActiveConfig.ExclusiveFullscreenEnabled())
+    Core::RunAsCPUThread([focus] { g_renderer->SetFullscreen(focus); });
 }
 
 bool Host::GetRenderFullscreen()
@@ -53,6 +56,10 @@ bool Host::GetRenderFullscreen()
 void Host::SetRenderFullscreen(bool fullscreen)
 {
   m_render_fullscreen = fullscreen;
+
+  if (g_renderer && g_renderer->IsFullscreen() != fullscreen &&
+      g_ActiveConfig.ExclusiveFullscreenEnabled())
+    Core::RunAsCPUThread([fullscreen] { g_renderer->SetFullscreen(fullscreen); });
 }
 
 void Host::ResizeSurface(int new_width, int new_height)

diff --git a/Source/Core/DolphinQt2/Host.h b/Source/Core/DolphinQt2/Host.h
@@ -37,7 +37,7 @@ class Host final : public QObject
 private:
   Host();
 
-  std::atomic<void*> m_render_handle;
-  std::atomic<bool> m_render_focus;
-  std::atomic<bool> m_render_fullscreen;
+  std::atomic<void*> m_render_handle{nullptr};
+  std::atomic<bool> m_render_focus{false};
+  std::atomic<bool> m_render_fullscreen{false};
 };