fix for d3d fullscreen toggle (mpc-hc#188)

stdedos · Dec 28, 2019 · 43d06b1 · 43d06b1
1 parent 4746efb
commit 43d06b1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp
@@ -60,6 +60,7 @@ CDX9AllocatorPresenter::CDX9AllocatorPresenter(HWND hWnd, bool bFullscreen, HRES
     , m_VSyncMode(0)
     , m_bDesktopCompositionDisabled(false)
     , m_bIsFullscreen(bFullscreen)
+    , fullScreenChanged(false)
     , m_bNeedCheckSample(true)
     , m_MainThreadId(0)
     , m_bIsRendering(false)
@@ -671,7 +672,7 @@ HRESULT CDX9AllocatorPresenter::CreateDevice(CString& _Error)
         }
 
         HWND hFocusWindow = m_FocusThread->GetFocusWindow();
-        bTryToReset &= m_hFocusWindow == hFocusWindow;
+        bTryToReset &= (m_hFocusWindow == hFocusWindow || fullScreenChanged);
         m_hFocusWindow = hFocusWindow;
 
         if (m_pD3DEx) {
@@ -742,7 +743,7 @@ HRESULT CDX9AllocatorPresenter::CreateDevice(CString& _Error)
             pp.PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE;
         }
 
-        bTryToReset &= m_hFocusWindow == m_hWnd;
+        bTryToReset &= (m_hFocusWindow == m_hWnd || fullScreenChanged);
         m_hFocusWindow = m_hWnd;
 
         if (m_pD3DEx) {
@@ -2260,6 +2261,7 @@ STDMETHODIMP CDX9AllocatorPresenter::SetPixelShader2(LPCSTR pSrcData, LPCSTR pTa
 
 STDMETHODIMP CDX9AllocatorPresenter::SetD3DFullscreen(bool fEnabled)
 {
+    fullScreenChanged = (fEnabled != m_bIsFullscreen);
     m_bIsFullscreen = fEnabled;
     return S_OK;
 }

diff --git a/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.h b/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.h
@@ -48,7 +48,7 @@ namespace DSObjects
         int     m_OrderedPaint;
         int     m_VSyncMode;
         bool    m_bDesktopCompositionDisabled;
-        bool    m_bIsFullscreen;
+        bool    m_bIsFullscreen, fullScreenChanged;
         bool    m_bNeedCheckSample;
         DWORD   m_MainThreadId;
 

diff --git a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp
@@ -99,6 +99,7 @@ CBaseAP::CBaseAP(HWND hWnd, bool bFullscreen, HRESULT& hr, CString& _Error)
     , m_bCompositionEnabled(false)
     , m_bDesktopCompositionDisabled(false)
     , m_bIsFullscreen(bFullscreen)
+    , fullScreenChanged(false)
     , m_bNeedCheckSample(true)
     , m_dMainThreadId(0)
     , m_ScreenSize(0, 0)
@@ -516,7 +517,7 @@ HRESULT CBaseAP::CreateDXDevice(CString& _Error)
         }
 
         HWND hFocusWindow = m_FocusThread->GetFocusWindow();
-        bTryToReset &= m_hFocusWindow == hFocusWindow;
+        bTryToReset &= (m_hFocusWindow == hFocusWindow || fullScreenChanged);
         m_hFocusWindow = hFocusWindow;
 
         if (m_pD3DEx) {
@@ -588,7 +589,7 @@ HRESULT CBaseAP::CreateDXDevice(CString& _Error)
             m_pp.PresentationInterval = D3DPRESENT_INTERVAL_ONE;
         }
 
-        bTryToReset &= m_hFocusWindow == m_hWnd;
+        bTryToReset &= (m_hFocusWindow == m_hWnd || fullScreenChanged);
         m_hFocusWindow = m_hWnd;
 
         if (m_pD3DEx) {
@@ -4615,6 +4616,7 @@ HRESULT CGenlock::UpdateStats(double syncOffset, double frameCycle)
 
 STDMETHODIMP CSyncAP::SetD3DFullscreen(bool fEnabled)
 {
+    fullScreenChanged = (fEnabled != m_bIsFullscreen);
     m_bIsFullscreen = fEnabled;
     return S_OK;
 }

diff --git a/src/filters/renderer/VideoRenderers/SyncRenderer.h b/src/filters/renderer/VideoRenderers/SyncRenderer.h
@@ -261,7 +261,7 @@ namespace GothSync
         bool m_bHighColorResolution;
         bool m_bCompositionEnabled;
         bool m_bDesktopCompositionDisabled;
-        bool m_bIsFullscreen;
+        bool m_bIsFullscreen, fullScreenChanged;
         bool m_bNeedCheckSample;
         DWORD m_dMainThreadId;
 

diff --git a/src/mpc-hc/VMROSD.cpp b/src/mpc-hc/VMROSD.cpp
@@ -59,8 +59,8 @@ CVMROSD::CVMROSD(CMainFrame* pMainFrame)
         m_colors[OSD_BACKGROUND] = CMPCTheme::ContentBGColor;
         m_colors[OSD_BORDER] = CMPCTheme::WindowBorderColorDim;
         m_colors[OSD_TEXT] = CMPCTheme::TextFGColor;
-        m_colors[OSD_BAR] = CMPCTheme::ContentBGColor;
-        m_colors[OSD_CURSOR] = CMPCTheme::TextFGColor;
+        m_colors[OSD_BAR] = CMPCTheme::ScrollBGColor;
+        m_colors[OSD_CURSOR] = CMPCTheme::ScrollThumbColor;
         m_colors[OSD_DEBUGCLR] = CMPCTheme::DebugColorRed;
     } else {
         m_colors[OSD_TRANSPARENT] = RGB(0, 0, 0);