From 0586c98f90866e4bc9f0dfe73aefb0a07c56697e Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 12 12月 2023 15:44:14 +0800
Subject: [PATCH] Add win10 border handler
---
src/core/contexts/win32windowcontext.cpp | 393 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 313 insertions(+), 80 deletions(-)
diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index 4d08adc..8ed1f39 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -1,13 +1,15 @@
#include "win32windowcontext_p.h"
-#include "qwkcoreglobal_p.h"
#include <optional>
#include <QtCore/QHash>
-#include <QtCore/QAbstractNativeEventFilter>
#include <QtCore/QScopeGuard>
#include <QtGui/QGuiApplication>
+#include <QtGui/QPainter>
+#include <QtGui/QPalette>
+#include <QtGui/QStyleHints>
+#include <QtCore/private/qwinregistry_p.h>
#include <QtCore/private/qsystemlibrary_p.h>
#include <QtGui/private/qhighdpiscaling_p.h>
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
@@ -23,7 +25,11 @@
#include <shellscalingapi.h>
#include <dwmapi.h>
#include <timeapi.h>
-#include <versionhelpers.h>
+
+#include "nativeeventfilter.h"
+#include "qwkglobal_p.h"
+
+#include "win10borderhandler_p.h"
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
Q_DECLARE_METATYPE(QMargins)
@@ -31,8 +37,42 @@
namespace QWK {
+ enum _DWMWINDOWATTRIBUTE {
+ // [set] BOOL, Allows the use of host backdrop brushes for the window.
+ _DWMWA_USE_HOSTBACKDROPBRUSH = 17,
+
+ // Undocumented, the same with DWMWA_USE_IMMERSIVE_DARK_MODE, but available on systems
+ // before Win10 20H1.
+ _DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1 = 19,
+
+ // [set] BOOL, Allows a window to either use the accent color, or dark, according to the
+ // user Color Mode preferences.
+ _DWMWA_USE_IMMERSIVE_DARK_MODE = 20,
+
+ // [set] WINDOW_CORNER_PREFERENCE, Controls the policy that rounds top-level window corners
+ _DWMWA_WINDOW_CORNER_PREFERENCE = 33,
+
+ // [get] UINT, width of the visible border around a thick frame window
+ _DWMWA_VISIBLE_FRAME_BORDER_THICKNESS = 37,
+
+ // [get, set] SYSTEMBACKDROP_TYPE, Controls the system-drawn backdrop material of a window,
+ // including behind the non-client area.
+ _DWMWA_SYSTEMBACKDROP_TYPE = 38,
+
+ // Undocumented, use this value to enable Mica material on Win11 21H2. You should use
+ // DWMWA_SYSTEMBACKDROP_TYPE instead on Win11 22H2 and newer.
+ _DWMWA_MICA_EFFECT = 1029
+ };
+
// The thickness of an auto-hide taskbar in pixels.
- static constexpr const auto kAutoHideTaskBarThickness = quint8{2};
+ static constexpr const quint8 kAutoHideTaskBarThickness = 2;
+
+ QWK_USED static constexpr const struct {
+ const uint32_t activeLight = MAKE_RGBA_COLOR(110, 110, 110, 255); // #6E6E6E
+ const uint32_t activeDark = MAKE_RGBA_COLOR(51, 51, 51, 255); // #333333
+ const uint32_t inactiveLight = MAKE_RGBA_COLOR(167, 167, 167, 255); // #A7A7A7
+ const uint32_t inactiveDark = MAKE_RGBA_COLOR(61, 61, 62, 255); // #3D3D3E
+ } kWindowsColorSet;
// hWnd -> context
using WndProcHash = QHash<HWND, Win32WindowContext *>;
@@ -52,22 +92,30 @@
} g_hook{};
struct DynamicApis {
-// template <typename T>
-// struct DefaultFunc;
-//
-// template <typename Return, typename... Args>
-// struct DefaultFunc<Return(QT_WIN_CALLBACK *)(Args...)> {
-// static Return STDAPICALLTYPE func(Args...) {
-// return Return{};
-// }
-// };
-//
-// #define DYNAMIC_API_DECLARE(NAME) decltype(&::NAME) p##NAME = DefaultFunc<decltype(&::NAME)>::func
+ static const DynamicApis &instance() {
+ static const DynamicApis inst{};
+ return inst;
+ }
+
+ // template <typename T>
+ // struct DefaultFunc;
+ //
+ // template <typename Return, typename... Args>
+ // struct DefaultFunc<Return(QT_WIN_CALLBACK *)(Args...)> {
+ // static Return STDAPICALLTYPE func(Args...) {
+ // return Return{};
+ // }
+ // };
+ //
+ // #define DYNAMIC_API_DECLARE(NAME) decltype(&::NAME) p##NAME =
+ // DefaultFunc<decltype(&::NAME)>::func
+
#define DYNAMIC_API_DECLARE(NAME) decltype(&::NAME) p##NAME = nullptr
DYNAMIC_API_DECLARE(DwmFlush);
DYNAMIC_API_DECLARE(DwmIsCompositionEnabled);
DYNAMIC_API_DECLARE(DwmGetCompositionTimingInfo);
+ DYNAMIC_API_DECLARE(DwmGetWindowAttribute);
DYNAMIC_API_DECLARE(GetDpiForWindow);
DYNAMIC_API_DECLARE(GetSystemMetricsForDpi);
DYNAMIC_API_DECLARE(GetDpiForMonitor);
@@ -77,8 +125,10 @@
#undef DYNAMIC_API_DECLARE
+ private:
DynamicApis() {
-#define DYNAMIC_API_RESOLVE(DLL, NAME) p##NAME = reinterpret_cast<decltype(p##NAME)>(DLL.resolve(#NAME))
+#define DYNAMIC_API_RESOLVE(DLL, NAME) \
+ p##NAME = reinterpret_cast<decltype(p##NAME)>(DLL.resolve(#NAME))
QSystemLibrary user32(QStringLiteral("user32"));
DYNAMIC_API_RESOLVE(user32, GetDpiForWindow);
@@ -91,6 +141,7 @@
DYNAMIC_API_RESOLVE(dwmapi, DwmFlush);
DYNAMIC_API_RESOLVE(dwmapi, DwmIsCompositionEnabled);
DYNAMIC_API_RESOLVE(dwmapi, DwmGetCompositionTimingInfo);
+ DYNAMIC_API_RESOLVE(dwmapi, DwmGetWindowAttribute);
QSystemLibrary winmm(QStringLiteral("winmm"));
DYNAMIC_API_RESOLVE(winmm, timeGetDevCaps);
@@ -102,12 +153,6 @@
~DynamicApis() = default;
- static const DynamicApis &instance() {
- static const DynamicApis inst{};
- return inst;
- }
-
- private:
Q_DISABLE_COPY_MOVE(DynamicApis)
};
@@ -192,22 +237,22 @@
}
static inline bool isWin8OrGreater() {
- static const bool result = ::IsWindows8OrGreater();
+ static const bool result = IsWindows8OrGreater_Real();
return result;
}
static inline bool isWin8Point1OrGreater() {
- static const bool result = ::IsWindows8Point1OrGreater();
+ static const bool result = IsWindows8Point1OrGreater_Real();
return result;
}
static inline bool isWin10OrGreater() {
- static const bool result = ::IsWindows10OrGreater();
+ static const bool result = IsWindows10OrGreater_Real();
return result;
}
static inline bool isWin11OrGreater() {
- static const bool result = ::IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN10), LOBYTE(_WIN32_WINNT_WIN10), 22000);
+ static const bool result = IsWindows11OrGreater_Real();
return result;
}
@@ -221,6 +266,72 @@
}
BOOL enabled = FALSE;
return SUCCEEDED(apis.pDwmIsCompositionEnabled(&enabled)) && enabled;
+ }
+
+ static inline bool isWindowFrameBorderColorized() {
+ const QWinRegistryKey registry(HKEY_CURRENT_USER, LR"(Software\Microsoft\Windows\DWM)");
+ if (!registry.isValid()) {
+ return false;
+ }
+ const auto value = registry.dwordValue(L"ColorPrevalence");
+ if (!value.second) {
+ return false;
+ }
+ return value.first;
+ }
+
+ static inline bool isDarkThemeActive() {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+ return QGuiApplication::styleHints()->colorScheme() == Qt::ColorScheme::Dark;
+#else
+ const QWinRegistryKey registry(
+ HKEY_CURRENT_USER, LR"(Software\Microsoft\Windows\CurrentVersion\Themes\Personalize)");
+ if (!registry.isValid()) {
+ return false;
+ }
+ const auto value = registry.dwordValue(L"AppsUseLightTheme");
+ if (!value.second) {
+ return false;
+ }
+ return !value.first;
+#endif
+ }
+
+ static inline bool isDarkWindowFrameEnabled(HWND hwnd) {
+ BOOL enabled = FALSE;
+ const DynamicApis &apis = DynamicApis::instance();
+ if (SUCCEEDED(apis.pDwmGetWindowAttribute(hwnd, _DWMWA_USE_IMMERSIVE_DARK_MODE, &enabled,
+ sizeof(enabled)))) {
+ return enabled;
+ } else if (SUCCEEDED(apis.pDwmGetWindowAttribute(hwnd,
+ _DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1,
+ &enabled, sizeof(enabled)))) {
+ return enabled;
+ } else {
+ return false;
+ }
+ }
+
+ static inline QColor getAccentColor() {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
+ return QGuiApplication::palette().color(QPalette::Accent);
+#else
+ const QWinRegistryKey registry(HKEY_CURRENT_USER, LR"(Software\Microsoft\Windows\DWM)");
+ if (!registry.isValid()) {
+ return {};
+ }
+ const auto value = registry.dwordValue(L"AccentColor");
+ if (!value.second) {
+ return {};
+ }
+ // The retrieved value is in the #AABBGGRR format, we need to
+ // convert it to the #AARRGGBB format which Qt expects.
+ const QColor abgr = QColor::fromRgba(value.first);
+ if (!abgr.isValid()) {
+ return {};
+ }
+ return QColor::fromRgb(abgr.blue(), abgr.green(), abgr.red(), abgr.alpha());
+#endif
}
static inline void triggerFrameChange(HWND hwnd) {
@@ -242,43 +353,49 @@
} else { // Win2K
HDC hdc = ::GetDC(nullptr);
const int dpiX = ::GetDeviceCaps(hdc, LOGPIXELSX);
- const int dpiY = ::GetDeviceCaps(hdc, LOGPIXELSY);
+ // const int dpiY = ::GetDeviceCaps(hdc, LOGPIXELSY);
::ReleaseDC(nullptr, hdc);
return quint32(dpiX);
}
}
- static inline quint32 getResizeBorderThickness(HWND hwnd) {
+ static inline quint32 getSystemMetricsForDpi(int index, quint32 dpi) {
const DynamicApis &apis = DynamicApis::instance();
if (apis.pGetSystemMetricsForDpi) {
- const quint32 dpi = getDpiForWindow(hwnd);
- return apis.pGetSystemMetricsForDpi(SM_CXSIZEFRAME, dpi) +
- apis.pGetSystemMetricsForDpi(SM_CXPADDEDBORDER, dpi);
- } else {
- return ::GetSystemMetrics(SM_CXSIZEFRAME) + ::GetSystemMetrics(SM_CXPADDEDBORDER);
+ return ::GetSystemMetricsForDpi(index, dpi);
}
+ return ::GetSystemMetrics(index);
+ }
+
+ static inline quint32 getWindowFrameBorderThickness(HWND hwnd) {
+ const DynamicApis &apis = DynamicApis::instance();
+ if (UINT result = 0; SUCCEEDED(apis.pDwmGetWindowAttribute(
+ hwnd, _DWMWA_VISIBLE_FRAME_BORDER_THICKNESS, &result, sizeof(result)))) {
+ return result;
+ }
+ return getSystemMetricsForDpi(SM_CXBORDER, getDpiForWindow(hwnd));
+ }
+
+ static inline quint32 getResizeBorderThickness(HWND hwnd) {
+ const quint32 dpi = getDpiForWindow(hwnd);
+ return getSystemMetricsForDpi(SM_CXSIZEFRAME, dpi) +
+ getSystemMetricsForDpi(SM_CXPADDEDBORDER, dpi);
}
static inline quint32 getTitleBarHeight(HWND hwnd) {
- const auto captionHeight = [hwnd]() -> int {
- const DynamicApis &apis = DynamicApis::instance();
- if (apis.pGetSystemMetricsForDpi) {
- const quint32 dpi = getDpiForWindow(hwnd);
- return apis.pGetSystemMetricsForDpi(SM_CYCAPTION, dpi);
- } else {
- return ::GetSystemMetrics(SM_CYCAPTION);
- }
- }();
- return captionHeight + getResizeBorderThickness(hwnd);
+ const quint32 dpi = getDpiForWindow(hwnd);
+ return getSystemMetricsForDpi(SM_CYCAPTION, dpi) +
+ getSystemMetricsForDpi(SM_CXSIZEFRAME, dpi) +
+ getSystemMetricsForDpi(SM_CXPADDEDBORDER, dpi);
}
- static inline void updateInternalWindowFrameMargins(HWND hwnd, QWindow *window) {
+ static void updateInternalWindowFrameMargins(HWND hwnd, QWindow *window) {
const auto margins = [hwnd]() -> QMargins {
- const int titleBarHeight = getTitleBarHeight(hwnd);
+ const auto titleBarHeight = int(getTitleBarHeight(hwnd));
if (isWin10OrGreater()) {
return {0, -titleBarHeight, 0, 0};
} else {
- const int frameSize = getResizeBorderThickness(hwnd);
+ const auto frameSize = int(getResizeBorderThickness(hwnd));
return {-frameSize, -titleBarHeight, -frameSize, -frameSize};
}
}();
@@ -338,7 +455,7 @@
#endif
}
- static inline void syncPaintEventWithDwm() {
+ static void syncPaintEventWithDwm() {
// No need to sync with DWM if DWM composition is disabled.
if (!isDwmCompositionEnabled()) {
return;
@@ -383,9 +500,9 @@
apis.ptimeEndPeriod(ms_granularity);
}
- static inline void showSystemMenu2(HWND hWnd, const POINT &pos, const bool selectFirstEntry, const bool fixedSize)
- {
- const HMENU hMenu = ::GetSystemMenu(hWnd, FALSE);
+ static void showSystemMenu2(HWND hWnd, const POINT &pos, const bool selectFirstEntry,
+ const bool fixedSize) {
+ HMENU hMenu = ::GetSystemMenu(hWnd, FALSE);
if (!hMenu) {
// The corresponding window doesn't have a system menu, most likely due to the
// lack of the "WS_SYSMENU" window style. This situation should not be treated
@@ -395,8 +512,10 @@
const bool maxOrFull = IsMaximized(hWnd) || isFullScreen(hWnd);
::EnableMenuItem(hMenu, SC_CLOSE, (MF_BYCOMMAND | MFS_ENABLED));
- ::EnableMenuItem(hMenu, SC_MAXIMIZE, (MF_BYCOMMAND | ((maxOrFull || fixedSize) ? MFS_DISABLED : MFS_ENABLED)));
- ::EnableMenuItem(hMenu, SC_RESTORE, (MF_BYCOMMAND | ((maxOrFull && !fixedSize) ? MFS_ENABLED : MFS_DISABLED)));
+ ::EnableMenuItem(hMenu, SC_MAXIMIZE,
+ (MF_BYCOMMAND | ((maxOrFull || fixedSize) ? MFS_DISABLED : MFS_ENABLED)));
+ ::EnableMenuItem(hMenu, SC_RESTORE,
+ (MF_BYCOMMAND | ((maxOrFull && !fixedSize) ? MFS_ENABLED : MFS_DISABLED)));
// The first menu item should be selected by default if the menu is brought
// up by keyboard. I don't know how to pre-select a menu item but it seems
// highlight can do the job. However, there's an annoying issue if we do
@@ -406,9 +525,11 @@
// highlight bar will not move accordingly, the OS will generate another
// highlight bar to indicate the current selected menu item, which will make
// the menu look kind of weird. Currently I don't know how to fix this issue.
- ::HiliteMenuItem(hWnd, hMenu, SC_RESTORE, (MF_BYCOMMAND | (selectFirstEntry ? MFS_HILITE : MFS_UNHILITE)));
+ ::HiliteMenuItem(hWnd, hMenu, SC_RESTORE,
+ (MF_BYCOMMAND | (selectFirstEntry ? MFS_HILITE : MFS_UNHILITE)));
::EnableMenuItem(hMenu, SC_MINIMIZE, (MF_BYCOMMAND | MFS_ENABLED));
- ::EnableMenuItem(hMenu, SC_SIZE, (MF_BYCOMMAND | ((maxOrFull || fixedSize) ? MFS_DISABLED : MFS_ENABLED)));
+ ::EnableMenuItem(hMenu, SC_SIZE,
+ (MF_BYCOMMAND | ((maxOrFull || fixedSize) ? MFS_DISABLED : MFS_ENABLED)));
::EnableMenuItem(hMenu, SC_MOVE, (MF_BYCOMMAND | (maxOrFull ? MFS_DISABLED : MFS_ENABLED)));
// The default menu item will appear in bold font. There can only be one default
@@ -428,7 +549,10 @@
::SetMenuDefaultItem(hMenu, defaultItemId, FALSE);
// Popup the system menu at the required position.
- const auto result = ::TrackPopupMenu(hMenu, (TPM_RETURNCMD | (QGuiApplication::isRightToLeft() ? TPM_RIGHTALIGN : TPM_LEFTALIGN)), pos.x, pos.y, 0, hWnd, nullptr);
+ const auto result = ::TrackPopupMenu(
+ hMenu,
+ (TPM_RETURNCMD | (QGuiApplication::isRightToLeft() ? TPM_RIGHTALIGN : TPM_LEFTALIGN)),
+ pos.x, pos.y, 0, hWnd, nullptr);
// Unhighlight the first menu item after the popup menu is closed, otherwise it will keep
// highlighting until we unhighlight it manually.
@@ -467,7 +591,8 @@
case HTBORDER:
return Win32WindowContext::FixedBorder;
default:
- break; // unreachable
+ // unreachable
+ break;
}
return Win32WindowContext::Outside;
}
@@ -511,7 +636,7 @@
// DefWindowProc(). Consequently, we have to add a global native filter that forwards the result
// of the hook function, telling Qt whether we have filtered the events before. Since Qt only
// handles Windows window messages in the main thread, it is safe to do so.
- class WindowsNativeEventFilter : public QAbstractNativeEventFilter {
+ class WindowsNativeEventFilter : public NativeEventFilter {
public:
bool nativeEventFilter(const QByteArray &eventType, void *message,
QT_NATIVE_EVENT_RESULT_TYPE *result) override {
@@ -546,14 +671,12 @@
return;
}
instance = new WindowsNativeEventFilter();
- installNativeEventFilter(instance);
}
static inline void uninstall() {
if (!instance) {
return;
}
- removeNativeEventFilter(instance);
delete instance;
instance = nullptr;
}
@@ -661,6 +784,54 @@
}
}
+ QString Win32WindowContext::key() const {
+ return QStringLiteral("win32");
+ }
+
+ void Win32WindowContext::virtual_hook(int id, void *data) {
+ switch (id) {
+ case CentralizeHook: {
+ const auto hwnd = reinterpret_cast<HWND>(m_windowHandle->winId());
+ moveToDesktopCenter(hwnd);
+ return;
+ }
+
+ case ShowSystemMenuHook: {
+ const auto &pos = *static_cast<const QPoint *>(data);
+ auto hWnd = reinterpret_cast<HWND>(m_windowHandle->winId());
+ showSystemMenu2(hWnd, qpoint2point(pos), false,
+ m_delegate->isHostSizeFixed(m_host));
+ return;
+ }
+
+ case DefaultColorsHook: {
+ auto map = *reinterpret_cast<QMap<QString, QColor> *>(data);
+ map.clear();
+ map.insert("activeLight", kWindowsColorSet.activeLight);
+ map.insert("activeDark", kWindowsColorSet.activeDark);
+ map.insert("inactiveLight", kWindowsColorSet.inactiveLight);
+ map.insert("inactiveDark", kWindowsColorSet.inactiveDark);
+ return;
+ }
+
+ default: {
+ // unreachable
+ break;
+ }
+ }
+ AbstractWindowContext::virtual_hook(id, data);
+ }
+
+ bool Win32WindowContext::needWin10BorderHandler() const {
+ return isWin10OrGreater() && !isWin11OrGreater();
+ }
+
+ void Win32WindowContext::setWin10BorderHandler(Win10BorderHandler *handler) {
+ win10BorderHandler.reset(handler);
+ handler->setBorderThickness(
+ int(getWindowFrameBorderThickness(reinterpret_cast<HWND>(windowId))));
+ }
+
bool Win32WindowContext::setupHost() {
// Install window hook
auto winId = m_windowHandle->winId();
@@ -721,6 +892,7 @@
return true;
}
+ // Whether to show system menu
if (systemMenuHandler(hWnd, message, wParam, lParam, result)) {
return true;
}
@@ -728,11 +900,10 @@
return false; // Not handled
}
- static constexpr const auto kMessageTag = WPARAM(0x97CCEA99);
-
- static inline constexpr bool isTaggedMessage(WPARAM wParam) {
- return (wParam == kMessageTag);
- }
+ QWK_USED static constexpr const struct {
+ const WPARAM wParam = 0xF1C9ADD4;
+ const LPARAM lParam = 0xAFB6F4C6;
+ } kMessageTag;
static inline quint64 getKeyState() {
quint64 result = 0;
@@ -772,7 +943,7 @@
// wParam is always ignored in mouse leave messages, but here we
// give them a special tag to be able to distinguish which messages
// are sent by ourselves.
- return kMessageTag;
+ return kMessageTag.wParam;
}
const quint64 keyState = getKeyState();
if ((myMsg >= WM_NCXBUTTONDOWN) && (myMsg <= WM_NCXBUTTONDBLCLK)) {
@@ -850,6 +1021,7 @@
SEND_MESSAGE(hWnd, WM_MOUSELEAVE, wParamNew, lParamNew);
break;
default:
+ // unreachable
break;
}
@@ -872,7 +1044,7 @@
LPARAM lParam, LRESULT *result) {
switch (message) {
case WM_MOUSELEAVE: {
- if (!isTaggedMessage(wParam)) {
+ if (wParam != kMessageTag.wParam) {
// Qt will call TrackMouseEvent() to get the WM_MOUSELEAVE message when it
// receives WM_MOUSEMOVE messages, and since we are converting every
// WM_NCMOUSEMOVE message to WM_MOUSEMOVE message and send it back to the window
@@ -884,8 +1056,9 @@
DWORD dwScreenPos = ::GetMessagePos();
POINT screenPoint{GET_X_LPARAM(dwScreenPos), GET_Y_LPARAM(dwScreenPos)};
::ScreenToClient(hWnd, &screenPoint);
- QPoint qtScenePos = QHighDpi::fromNativeLocalPosition(point2qpoint(screenPoint), m_windowHandle);
- auto dummy = CoreWindowAgent::Unknown;
+ QPoint qtScenePos = QHighDpi::fromNativeLocalPosition(point2qpoint(screenPoint),
+ m_windowHandle);
+ auto dummy = WindowAgentBase::Unknown;
if (isInSystemButtons(qtScenePos, &dummy)) {
// We must record whether the last WM_MOUSELEAVE was filtered, because if
// Qt does not receive this message it will not call TrackMouseEvent()
@@ -1021,6 +1194,7 @@
}
break;
}
+
case WM_NCHITTEST: {
// 鍘熺敓Win32绐楀彛鍙湁椤惰竟鏄湪绐楀彛鍐呴儴resize鐨勶紝鍏朵綑涓夎竟閮芥槸鍦ㄧ獥鍙�
// 澶栭儴杩涜resize鐨勶紝鍏跺師鐞嗘槸锛學S_THICKFRAME杩欎釜绐楀彛鏍峰紡浼氬湪绐�
@@ -1116,13 +1290,14 @@
auto clientWidth = RECT_WIDTH(clientRect);
auto clientHeight = RECT_HEIGHT(clientRect);
- QPoint qtScenePos = QHighDpi::fromNativeLocalPosition(point2qpoint(nativeLocalPos), m_windowHandle);
+ QPoint qtScenePos =
+ QHighDpi::fromNativeLocalPosition(point2qpoint(nativeLocalPos), m_windowHandle);
bool isFixedSize = m_delegate->isHostSizeFixed(m_host);
bool isTitleBar = isInTitleBarDraggableArea(qtScenePos);
bool dontOverrideCursor = false; // ### TODO
- CoreWindowAgent::SystemButton sysButtonType = CoreWindowAgent::Unknown;
+ WindowAgentBase::SystemButton sysButtonType = WindowAgentBase::Unknown;
if (!isFixedSize && isInSystemButtons(qtScenePos, &sysButtonType)) {
// Firstly, we set the hit test result to a default value to be able to detect
// whether we have changed it or not afterwards.
@@ -1132,7 +1307,7 @@
// this is also the normal behavior of a native Win32 window (but only when the
// window is not maximized/fullscreen/minimized, of course).
if (isWindowNoState(hWnd)) {
- static constexpr const auto kBorderSize = quint8{2};
+ static constexpr const quint8 kBorderSize = 2;
bool isTop = (nativeLocalPos.y <= kBorderSize);
bool isLeft = nativeLocalPos.x <= kBorderSize;
bool isRight = (nativeLocalPos.x >= (clientWidth - kBorderSize));
@@ -1166,23 +1341,24 @@
// exact role of our button. The Snap Layout feature introduced in Windows
// 11 won't work without this.
switch (sysButtonType) {
- case CoreWindowAgent::WindowIcon:
+ case WindowAgentBase::WindowIcon:
*result = HTSYSMENU;
break;
- case CoreWindowAgent::Help:
+ case WindowAgentBase::Help:
*result = HTHELP;
break;
- case CoreWindowAgent::Minimize:
+ case WindowAgentBase::Minimize:
*result = HTREDUCE;
break;
- case CoreWindowAgent::Maximize:
+ case WindowAgentBase::Maximize:
*result = HTZOOM;
break;
- case CoreWindowAgent::Close:
+ case WindowAgentBase::Close:
*result = HTCLOSE;
break;
default:
- break; // unreachable
+ // unreachable
+ break;
}
}
if (*result == HTNOWHERE) {
@@ -1307,9 +1483,27 @@
return true;
}
}
+
+ case WM_WINDOWPOSCHANGING: {
+ // ### FIXME: How does this problem happen and why is it solved?
+ // When toggling the "Show theme color in title bar and window border" setting in
+ // Windows Settings, or calling `DrawMenuBar()`, Windows sends a message of
+ // WM_WINDOWPOSCHANGING with flags 0x37. If we do not process this message,
+ // the client area as a whole will shift to the left, which looks very abnormal if
+ // we don't repaint it. This exception disappears if we add SWP_NOCOPYBITS flag.
+ // But I don't know what caused the problem, or why this would solve it.
+ const auto windowPos = reinterpret_cast<LPWINDOWPOS>(lParam);
+ if (windowPos->flags ==
+ (SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED)) {
+ windowPos->flags |= SWP_NOCOPYBITS;
+ }
+ break;
+ }
+
default:
break;
}
+
if (!isWin10OrGreater()) {
switch (message) {
case WM_NCUAHDRAWCAPTION:
@@ -1628,7 +1822,8 @@
}();
RECT windowPos{};
::GetWindowRect(hWnd, &windowPos);
- return {static_cast<LONG>(windowPos.left + horizontalOffset), static_cast<LONG>(windowPos.top + verticalOffset)};
+ return {static_cast<LONG>(windowPos.left + horizontalOffset),
+ static_cast<LONG>(windowPos.top + verticalOffset)};
};
bool shouldShowSystemMenu = false;
bool broughtByKeyboard = false;
@@ -1636,7 +1831,8 @@
switch (message) {
case WM_RBUTTONUP: {
const POINT nativeLocalPos = getNativePosFromMouse();
- const QPoint qtScenePos = QHighDpi::fromNativeLocalPosition(point2qpoint(nativeLocalPos), m_windowHandle);
+ const QPoint qtScenePos =
+ QHighDpi::fromNativeLocalPosition(point2qpoint(nativeLocalPos), m_windowHandle);
if (isInTitleBarDraggableArea(qtScenePos)) {
shouldShowSystemMenu = true;
nativeGlobalPos = nativeLocalPos;
@@ -1675,7 +1871,8 @@
break;
}
if (shouldShowSystemMenu) {
- showSystemMenu2(hWnd, nativeGlobalPos, broughtByKeyboard, m_delegate->isHostSizeFixed(m_host));
+ showSystemMenu2(hWnd, nativeGlobalPos, broughtByKeyboard,
+ m_delegate->isHostSizeFixed(m_host));
// QPA's internal code will handle system menu events separately, and its
// behavior is not what we would want to see because it doesn't know our
// window doesn't have any window frame now, so return early here to avoid
@@ -1686,4 +1883,40 @@
return false;
}
+ void Win10BorderHandler::paintBorder(QPainter &painter, const QRect &rect,
+ const QRegion ®ion) {
+ Q_UNUSED(rect)
+ Q_UNUSED(region)
+
+ QPen pen;
+ pen.setWidth(m_borderThickness * 2);
+
+ const bool dark = isDarkThemeActive() &&
+ isDarkWindowFrameEnabled(reinterpret_cast<HWND>(m_window->winId()));
+ if (isActive()) {
+ if (isWindowFrameBorderColorized()) {
+ pen.setColor(getAccentColor());
+ } else {
+ static QColor frameBorderActiveColorLight(kWindowsColorSet.activeLight);
+ static QColor frameBorderActiveColorDark(kWindowsColorSet.activeDark);
+ pen.setColor(dark ? frameBorderActiveColorDark : frameBorderActiveColorLight);
+ }
+ } else {
+ static QColor frameBorderInactiveColorLight(kWindowsColorSet.inactiveLight);
+ static QColor frameBorderInactiveColorDark(kWindowsColorSet.inactiveDark);
+ pen.setColor(dark ? frameBorderInactiveColorDark : frameBorderInactiveColorLight);
+ }
+ painter.save();
+
+ // ### TODO: do we need to enable or disable it?
+ painter.setRenderHint(QPainter::Antialiasing);
+
+ painter.setPen(pen);
+ painter.drawLine(QLine{
+ QPoint{0, 0},
+ QPoint{m_window->width(), 0}
+ });
+ painter.restore();
+ }
+
}
--
Gitblit v1.9.1