fix for dynamic changing 3d mode

eriforce · Aug 31, 2024 · 2e1800f · 2e1800f
1 parent eada184
commit 2e1800f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/Magpie.Core/OverlayDrawer.cpp b/src/Magpie.Core/OverlayDrawer.cpp
@@ -159,7 +159,7 @@ static SmallVector<uint32_t> GenerateTimelineColors(const std::vector<Renderer::
 }
 
 OverlayDrawer::~OverlayDrawer() {
-	if (ScalingWindow::Get().Options().Is3DGameMode() && IsUIVisible()) {
+	if (_openWith3DGameMode && IsUIVisible()) {
 		HWND hwndSrc = ScalingWindow::Get().HwndSrc();
 		EnableWindow(hwndSrc, TRUE);
 		// 此时用户通过热键退出缩放，应激活源窗口
@@ -261,7 +261,8 @@ void OverlayDrawer::SetUIVisibility(bool value, bool noSetForeground) noexcept {
 	_isUIVisiable = value;
 
 	if (value) {
-		if (ScalingWindow::Get().Options().Is3DGameMode()) {
+		_openWith3DGameMode = ScalingWindow::Get().Options().Is3DGameMode();
+		if (_openWith3DGameMode) {
 			// 使全屏窗口不透明且可以接收焦点
 			HWND hwndHost = ScalingWindow::Get().Handle();
 			INT_PTR style = GetWindowLongPtr(hwndHost, GWL_EXSTYLE);
@@ -278,7 +279,7 @@ void OverlayDrawer::SetUIVisibility(bool value, bool noSetForeground) noexcept {
 			_imguiImpl.ClearStates();
 		}
 
-		if (ScalingWindow::Get().Options().Is3DGameMode()) {
+		if (_openWith3DGameMode) {
 			// 还原全屏窗口样式
 			HWND hwndHost = ScalingWindow::Get().Handle();
 			INT_PTR style = GetWindowLongPtr(hwndHost, GWL_EXSTYLE);

diff --git a/src/Magpie.Core/OverlayDrawer.h b/src/Magpie.Core/OverlayDrawer.h
@@ -87,6 +87,7 @@ class OverlayDrawer {
 
 	bool _isUIVisiable = false;
 	bool _isFirstFrame = true;
+	bool _openWith3DGameMode;
 };
 
 }
diff --git a/src/Magpie.Core/ScalingWindow.cpp b/src/Magpie.Core/ScalingWindow.cpp
@@ -475,9 +475,9 @@ int ScalingWindow::_CheckSrcState() const noexcept {
 		HWND hwndForeground = GetForegroundWindow();
 
 		// 3D 游戏模式下打开叠加层后如果源窗口意外回到前台应关闭叠加层
-		// if (_options.Is3DGameMode() && _renderer->IsOverlayVisible() && hwndForeground == _hwndSrc) {
-		// 	_renderer->SetOverlayVisibility(false, true);
-		// }
+		if (_options.Is3DGameMode() && _renderer->IsOverlayVisible() && hwndForeground == _hwndSrc) {
+			_renderer->SetOverlayVisibility(false, true);
+		}
 
 		// 在 3D 游戏模式下打开叠加层则全屏窗口可以接收焦点
 		if (!_options.Is3DGameMode() || !_renderer->IsOverlayVisible() || hwndForeground != _hWnd) {