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 | 187 +++++++++++++++++++++-------------------------
1 files changed, 84 insertions(+), 103 deletions(-)
diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index 22d9f1c..8ed1f39 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -29,6 +29,8 @@
#include "nativeeventfilter.h"
#include "qwkglobal_p.h"
+#include "win10borderhandler_p.h"
+
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
Q_DECLARE_METATYPE(QMargins)
#endif
@@ -65,7 +67,7 @@
// The thickness of an auto-hide taskbar in pixels.
static constexpr const quint8 kAutoHideTaskBarThickness = 2;
- static constexpr const struct {
+ 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
@@ -357,44 +359,37 @@
}
}
- static inline quint32 getWindowFrameBorderThickness(HWND hwnd) {
- UINT result = 0;
+ static inline quint32 getSystemMetricsForDpi(int index, quint32 dpi) {
const DynamicApis &apis = DynamicApis::instance();
- if (SUCCEEDED(apis.pDwmGetWindowAttribute(hwnd, _DWMWA_VISIBLE_FRAME_BORDER_THICKNESS,
- &result, sizeof(result)))) {
- return result;
- } else {
- const quint32 dpi = getDpiForWindow(hwnd);
- result = quint32(std::round(qreal(1) * qreal(dpi) / qreal(USER_DEFAULT_SCREEN_DPI)));
+ if (apis.pGetSystemMetricsForDpi) {
+ 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 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);
- }
+ 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 auto titleBarHeight = int(getTitleBarHeight(hwnd));
if (isWin10OrGreater()) {
@@ -460,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;
@@ -505,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
@@ -809,74 +804,13 @@
return;
}
- case NeedsDrawBordersHook: {
- auto &result = *static_cast<bool *>(data);
- result = isWin10OrGreater() && !isWin11OrGreater();
- return;
- }
-
- case BorderThicknessHook: {
- auto args = static_cast<void **>(data);
- const bool requireNative = *static_cast<const bool *>(args[0]);
- quint32 &thickness = *static_cast<quint32 *>(args[1]);
- const auto hwnd = reinterpret_cast<HWND>(m_windowHandle->winId());
- const auto nativeThickness = getWindowFrameBorderThickness(hwnd);
- thickness = requireNative
- ? nativeThickness
- : QHighDpi::fromNativePixels(nativeThickness, m_windowHandle);
- return;
- }
-
- case BorderColorsHook: {
- auto arr = *reinterpret_cast<QList<QColor> *>(data);
- arr.clear();
- arr.push_back(kWindowsColorSet.activeLight);
- arr.push_back(kWindowsColorSet.activeDark);
- arr.push_back(kWindowsColorSet.inactiveLight);
- arr.push_back(kWindowsColorSet.inactiveDark);
- return;
- }
-
- case DrawBordersHook: {
- auto args = static_cast<void **>(data);
- auto &painter = *static_cast<QPainter *>(args[0]);
- const auto &rect = *static_cast<const QRect *>(args[1]);
- const auto ®ion = *static_cast<const QRegion *>(args[2]);
- const auto hwnd = reinterpret_cast<HWND>(m_windowHandle->winId());
-
- QPen pen;
- const auto borderThickness = int(QHighDpi::fromNativePixels(
- getWindowFrameBorderThickness(hwnd), m_windowHandle));
- pen.setWidth(borderThickness * 2);
- const bool active = m_delegate->isWindowActive(m_host);
- const bool dark = isDarkThemeActive() && isDarkWindowFrameEnabled(hwnd);
-
- if (active) {
- 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{rect.width(), 0}
- });
- painter.restore();
+ 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;
}
@@ -886,6 +820,16 @@
}
}
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() {
@@ -948,6 +892,7 @@
return true;
}
+ // Whether to show system menu
if (systemMenuHandler(hWnd, message, wParam, lParam, result)) {
return true;
}
@@ -955,7 +900,7 @@
return false; // Not handled
}
- static constexpr const struct {
+ QWK_USED static constexpr const struct {
const WPARAM wParam = 0xF1C9ADD4;
const LPARAM lParam = 0xAFB6F4C6;
} kMessageTag;
@@ -1099,7 +1044,7 @@
LPARAM lParam, LRESULT *result) {
switch (message) {
case WM_MOUSELEAVE: {
- if (wParam == kMessageTag.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
@@ -1362,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));
@@ -1938,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