From fee0c64a8f8d6237f94457b608cc09614514f9b5 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周六, 23 12月 2023 15:00:35 +0800
Subject: [PATCH] Fix window overflow
---
src/core/contexts/win32windowcontext.cpp | 49 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index 4ea0b5a..27450d9 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -722,22 +722,15 @@
DynamicApis::instance().pDwmExtendFrameIntoClientArea(hWnd, &margins);
}
-#if !QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
{
auto style = ::GetWindowLongPtrW(hWnd, GWL_STYLE);
- ::SetWindowLongPtrW(hWnd, GWL_STYLE, style | WS_THICKFRAME | WS_CAPTION);
- }
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
+ ::SetWindowLongPtrW(hWnd, GWL_STYLE, style & (~WS_SYSMENU));
+#else
+ ::SetWindowLongPtrW(hWnd, GWL_STYLE,
+ (style | WS_THICKFRAME | WS_CAPTION) & (~WS_SYSMENU));
#endif
-
-#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
- for (const auto attr : {
- _DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1,
- _DWMWA_USE_IMMERSIVE_DARK_MODE,
- }) {
- const BOOL enable = TRUE;
- DynamicApis::instance().pDwmSetWindowAttribute(hWnd, attr, &enable, sizeof(enable));
}
-#endif
// Add managed window
addManagedWindow(m_windowHandle, hWnd, this);
@@ -942,6 +935,29 @@
}
apis.pDwmExtendFrameIntoClientArea(hwnd, &defaultMargins);
}
+ return true;
+ } else if (key == QStringLiteral("dark-mode")) {
+ if (!isWin101809OrGreater()) {
+ return false;
+ }
+
+ BOOL enable = attribute.toBool();
+
+ if (isWin101903OrGreater()) {
+ apis.pSetPreferredAppMode(enable ? PAM_AUTO : PAM_DEFAULT);
+ } else {
+ apis.pAllowDarkModeForApp(enable);
+ }
+
+ for (const auto attr : {
+ _DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1,
+ _DWMWA_USE_IMMERSIVE_DARK_MODE,
+ }) {
+ apis.pDwmSetWindowAttribute(hwnd, attr, &enable, sizeof(enable));
+ }
+
+ apis.pFlushMenuThemes();
+
return true;
}
return false;
@@ -1667,7 +1683,6 @@
Q_UNUSED(message)
Q_UNUSED(this)
-#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
// Windows鏄牴鎹繖涓秷鎭殑杩斿洖鍊兼潵璁剧疆绐楀彛鐨勫鎴峰尯锛堢獥鍙ｄ腑鐪熸鏄剧ず鐨勫唴瀹癸級
// 鍜岄潪瀹㈡埛鍖猴紙鏍囬鏍忋�佺獥鍙ｈ竟妗嗐�佽彍鍗曟爮鍜岀姸鎬佹爮绛塛indows绯荤粺鑷鎻愪緵鐨勯儴鍒�
// 锛屼笉杩囧浜嶲t鏉ヨ锛岄櫎浜嗘爣棰樻爮鍜岀獥鍙ｈ竟妗嗭紝闈炲鎴峰尯鍩烘湰涔熼兘鏄嚜缁樼殑锛夌殑鑼�
@@ -1755,6 +1770,7 @@
// and align it with the upper-left corner of our new client area".
const auto clientRect = wParam ? &(reinterpret_cast<LPNCCALCSIZE_PARAMS>(lParam))->rgrc[0]
: reinterpret_cast<LPRECT>(lParam);
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
if (isWin10OrGreater()) {
// Store the original top margin before the default window procedure applies the
// default frame.
@@ -1782,6 +1798,7 @@
// technique to bring the top border back.
clientRect->top = originalTop;
}
+#endif
const bool max = IsMaximized(hWnd);
const bool full = isFullScreen(hWnd);
// We don't need this correction when we're fullscreen. We will
@@ -1796,11 +1813,16 @@
// a window when it's maximized unless you restore it).
const quint32 frameSize = getResizeBorderThickness(hWnd);
clientRect->top += frameSize;
+
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
if (!isWin10OrGreater()) {
+#endif
clientRect->bottom -= frameSize;
clientRect->left += frameSize;
clientRect->right -= frameSize;
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
}
+#endif
}
// Attempt to detect if there's an autohide taskbar, and if
// there is, reduce our size a bit on the side with the taskbar,
@@ -1875,7 +1897,6 @@
}
}
}
-#endif
// We should call this function only before the function returns.
syncPaintEventWithDwm();
// By returning WVR_REDRAW we can make the window resizing look
--
Gitblit v1.9.1