feat: 支持缩放中途出现的捕获错误

Blinue · Nov 5, 2024 · e635693 · e635693
1 parent dcab625
commit e635693
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 18 deletions.
diff --git a/src/Magpie.App/ScalingService.cpp b/src/Magpie.App/ScalingService.cpp
@@ -33,7 +33,6 @@ void ScalingService::Initialize() {
 	AppSettings::Get().IsAutoRestoreChanged({ this, &ScalingService::_Settings_IsAutoRestoreChanged });
 	_scalingRuntime = std::make_unique<ScalingRuntime>();
 	_scalingRuntime->IsRunningChanged({ this, &ScalingService::_ScalingRuntime_IsRunningChanged });
-	_scalingRuntime->ScalingFailed({ this, &ScalingService::_ScalingRuntime_ScalingFailed });
 
 	ShortcutService::Get().ShortcutActivated(
 		{ this, &ScalingService::_ShortcutService_ShortcutPressed }
@@ -234,15 +233,20 @@ void ScalingService::_Settings_IsAutoRestoreChanged(bool value) {
 	}
 }
 
-void ScalingService::_ScalingRuntime_IsRunningChanged(bool isRunning) {
-	_dispatcher.RunAsync(CoreDispatcherPriority::Normal, [this, isRunning]() {
+void ScalingService::_ScalingRuntime_IsRunningChanged(bool isRunning, ScalingError error) {
+	_dispatcher.RunAsync(CoreDispatcherPriority::Normal, [this, isRunning, error]() {
 		if (isRunning) {
 			StopTimer();
 
 			if (AppSettings::Get().IsAutoRestore()) {
 				_WndToRestore(NULL);
 			}
 		} else {
+			if (error != ScalingError::NoError && IsWindowVisible(_hwndCurSrc)) {
+				// 缩放初始化时或缩放中途出错
+				ShowError(_hwndCurSrc, error);
+			}
+
 			if (GetForegroundWindow() == _hwndCurSrc) {
 				// 退出全屏后如果前台窗口不变视为通过热键退出
 				_hwndChecked = _hwndCurSrc;
@@ -263,12 +267,6 @@ void ScalingService::_ScalingRuntime_IsRunningChanged(bool isRunning) {
 	});
 }
 
-void ScalingService::_ScalingRuntime_ScalingFailed(HWND hWnd, ScalingError error) {
-	_dispatcher.RunAsync(CoreDispatcherPriority::Normal, [hWnd, error]() {
-		ShowError(hWnd, error);
-	});
-}
-
 void ScalingService::_StartScale(HWND hWnd, const Profile& profile) {
 	if (profile.scalingMode < 0) {
 		ShowError(hWnd, ScalingError::InvalidScalingMode);

diff --git a/src/Magpie.App/ScalingService.h b/src/Magpie.App/ScalingService.h
@@ -68,8 +68,7 @@ class ScalingService {
 
 	void _Settings_IsAutoRestoreChanged(bool value);
 
-	void _ScalingRuntime_IsRunningChanged(bool isRunning);
-	void _ScalingRuntime_ScalingFailed(HWND hWnd, ScalingError error);
+	void _ScalingRuntime_IsRunningChanged(bool isRunning, ScalingError error);
 
 	void _StartScale(HWND hWnd, const Profile& profile);
 

diff --git a/src/Magpie.Core/Renderer.cpp b/src/Magpie.Core/Renderer.cpp
@@ -706,6 +706,7 @@ void Renderer::_BackendThreadProc() noexcept {
 		{
 			// 捕获出错，退出缩放
 			ScalingWindow::Get().Dispatcher().TryEnqueue([]() {
+				ScalingWindow::Get().RuntimeError(ScalingError::CaptureFailed);
 				ScalingWindow::Get().Destroy();
 			});
 

diff --git a/src/Magpie.Core/ScalingRuntime.cpp b/src/Magpie.Core/ScalingRuntime.cpp
@@ -54,7 +54,7 @@ void ScalingRuntime::Start(HWND hwndSrc, ScalingOptions&& options) {
 		return;
 	}
 
-	IsRunningChanged.Invoke(true);
+	IsRunningChanged.Invoke(true, ScalingError::NoError);
 
 	_Dispatcher().TryEnqueue([this, dispatcher(_Dispatcher()), hwndSrc, options(std::move(options))]() mutable {
 		ScalingError error = ScalingWindow::Get().Create(dispatcher, hwndSrc, std::move(options));
@@ -63,8 +63,7 @@ void ScalingRuntime::Start(HWND hwndSrc, ScalingOptions&& options) {
 		} else {
 			// 缩放失败
 			_state.store(_State::Idle, std::memory_order_relaxed);
-			IsRunningChanged.Invoke(false);
-			ScalingFailed.Invoke(hwndSrc, error);
+			IsRunningChanged.Invoke(false, error);
 		}
 	});
 }
@@ -160,7 +159,7 @@ void ScalingRuntime::_ScalingThreadProc() noexcept {
 				scalingWindow.Destroy();
 
 				if (_state.exchange(_State::Idle, std::memory_order_relaxed) != _State::Idle) {
-					IsRunningChanged.Invoke(false);
+					IsRunningChanged.Invoke(false, ScalingError::NoError);
 				}
 
 				return;
@@ -195,7 +194,7 @@ void ScalingRuntime::_ScalingThreadProc() noexcept {
 		} else {
 			// 缩放结束
 			_state.store(_State::Idle, std::memory_order_relaxed);
-			IsRunningChanged.Invoke(false);
+			IsRunningChanged.Invoke(false, scalingWindow.RuntimeError());
 		}
 	}
 }

diff --git a/src/Magpie.Core/ScalingRuntime.h b/src/Magpie.Core/ScalingRuntime.h
@@ -23,8 +23,7 @@ class ScalingRuntime {
 	}
 
 	// 调用者应处理线程同步
-	WinRTUtils::Event<winrt::delegate<bool>> IsRunningChanged;
-	WinRTUtils::Event<winrt::delegate<HWND, ScalingError>> ScalingFailed;
+	WinRTUtils::Event<winrt::delegate<bool, ScalingError>> IsRunningChanged;
 
 private:
 	void _ScalingThreadProc() noexcept;

diff --git a/src/Magpie.Core/ScalingWindow.cpp b/src/Magpie.Core/ScalingWindow.cpp
@@ -146,6 +146,7 @@ ScalingError ScalingWindow::Create(
 	_dispatcher = dispatcher;
 
 	_isSrcRepositioning = false;
+	_runtimeError = ScalingError::NoError;
 
 	if (FindWindow(CommonSharedConstants::SCALING_WINDOW_CLASS_NAME, nullptr)) {
 		Logger::Get().Error("已存在缩放窗口");

diff --git a/src/Magpie.Core/ScalingWindow.h b/src/Magpie.Core/ScalingWindow.h
@@ -59,6 +59,15 @@ class ScalingWindow : public WindowBase<ScalingWindow> {
 
 	void CleanAfterSrcRepositioned() noexcept;
 
+	// 缩放过程中出现的错误
+	ScalingError RuntimeError() const noexcept {
+		return _runtimeError;
+	}
+
+	void RuntimeError(ScalingError value) noexcept {
+		_runtimeError = value;
+	}
+
 protected:
 	LRESULT _MessageHandler(UINT msg, WPARAM wParam, LPARAM lParam) noexcept;
 
@@ -94,6 +103,8 @@ class ScalingWindow : public WindowBase<ScalingWindow> {
 
 	std::array<wil::unique_hwnd, 4> _hwndTouchHoles{};
 
+	ScalingError _runtimeError = ScalingError::NoError;
+
 	bool _isSrcRepositioning = false;
 	bool _isDDFWindowShown = false;
 };