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 | 63 +++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 12 deletions(-)
diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index bcf91f3..27450d9 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -21,6 +21,8 @@
# include <QtGui/qpa/qplatformwindow_p.h>
#endif
+#include <QWKCore/qwkconfig.h>
+
#include "qwkglobal_p.h"
#include "qwkwindowsextra_p.h"
@@ -55,7 +57,7 @@
static inline quint32 getDpiForWindow(HWND hwnd) {
const DynamicApis &apis = DynamicApis::instance();
- if (apis.pGetDpiForWindow) { // Win10
+ if (apis.pGetDpiForWindow) { // Win10
return apis.pGetDpiForWindow(hwnd);
} else if (apis.pGetDpiForMonitor) { // Win8.1
HMONITOR monitor = ::MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
@@ -712,20 +714,23 @@
auto winId = m_windowHandle->winId();
auto hWnd = reinterpret_cast<HWND>(winId);
- if (!isWin10OrGreater()) {
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
+ if (!isWin10OrGreater())
+#endif
+ {
static constexpr const MARGINS margins = {1, 1, 1, 1};
DynamicApis::instance().pDwmExtendFrameIntoClientArea(hWnd, &margins);
}
-#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));
- }
+ {
+ auto style = ::GetWindowLongPtrW(hWnd, GWL_STYLE);
+#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
+ }
// Add managed window
addManagedWindow(m_windowHandle, hWnd, this);
@@ -792,7 +797,8 @@
const auto hwnd = reinterpret_cast<HWND>(m_windowHandle->winId());
const DynamicApis &apis = DynamicApis::instance();
static constexpr const MARGINS extendMargins = {-1, -1, -1, -1};
- static const auto defaultMargins = isWin10OrGreater() ? MARGINS{0, 0, 0, 0} : MARGINS{1, 1, 1, 1};
+ static const auto defaultMargins =
+ isWin10OrGreater() ? MARGINS{0, 0, 0, 0} : MARGINS{1, 1, 1, 1};
if (key == QStringLiteral("mica")) {
if (!isWin11OrGreater()) {
return false;
@@ -929,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;
@@ -1459,6 +1488,7 @@
int frameSize = getResizeBorderThickness(hWnd);
bool isTop = (nativeLocalPos.y < frameSize);
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
if (isWin10OrGreater()) {
// This will handle the left, right and bottom parts of the frame
// because we didn't change them.
@@ -1501,7 +1531,9 @@
}
*result = HTCLIENT;
return true;
- } else {
+ } else
+#endif
+ {
if (full) {
*result = HTCLIENT;
return true;
@@ -1738,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.
@@ -1765,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
@@ -1779,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,
--
Gitblit v1.9.1