feat: 使弹窗的移动更平滑

Blinue · Oct 17, 2024 · 87b617a · 87b617a
1 parent cf6ae6c
commit 87b617a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/Magpie.App/ToastService.cpp b/src/Magpie.App/ToastService.cpp
@@ -69,18 +69,27 @@ void ToastService::ShowMessageOnWindow(std::wstring_view message, HWND hWnd) noe
 
 		// 定期更新弹窗位置
 		[](CoreDispatcher dispatcher, MUXC::TeachingTip teachingTip, HWND hWnd, HWND hwndToast) -> fire_and_forget {
+			RECT prevframeRect{};
 			do {
-				co_await 10ms;
+				co_await resume_background();
+				// 等待一帧的时间可以使弹窗的移动更平滑
+				DwmFlush();
 				co_await dispatcher;
 
 				if (!IsWindow(hwndToast)) {
 					break;
 				}
-
+				
 				RECT frameRect;
 				if (!Win32Utils::GetWindowFrameRect(hWnd, frameRect)) {
 					break;
 				}
+
+				// 窗口没有移动则无需更新
+				if (frameRect == prevframeRect) {
+					continue;
+				}
+				prevframeRect = frameRect;
 
 				SetWindowPos(
 					hwndToast,

diff --git a/src/Shared/Win32Utils.h b/src/Shared/Win32Utils.h
@@ -153,3 +153,10 @@ constexpr bool operator==(const SIZE& l, const SIZE& r) noexcept {
 constexpr bool operator==(const POINT& l, const POINT& r) noexcept {
 	return l.x == r.x && l.y == r.y;
 }
+
+// 避免和 d3d11.h 中的定义冲突
+#ifndef __d3d11_h__
+constexpr bool operator==(const RECT& l, const RECT& r) noexcept {
+	return l.left == r.left && l.top == r.top && l.right == r.right && l.bottom == r.bottom;
+}
+#endif