From a51b5688e1c33d3ce96b48c869603b00f908f513 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周三, 13 12月 2023 04:16:37 +0800
Subject: [PATCH] Make better code structure for border handlers
---
src/core/contexts/win32windowcontext.cpp | 175 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 129 insertions(+), 46 deletions(-)
diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index 8ed1f39..a706835 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -4,6 +4,7 @@
#include <QtCore/QHash>
#include <QtCore/QScopeGuard>
+#include <QtCore/QTimer>
#include <QtGui/QGuiApplication>
#include <QtGui/QPainter>
#include <QtGui/QPalette>
@@ -26,10 +27,8 @@
#include <dwmapi.h>
#include <timeapi.h>
-#include "nativeeventfilter.h"
+#include "nativeeventfilter_p.h"
#include "qwkglobal_p.h"
-
-#include "win10borderhandler_p.h"
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
Q_DECLARE_METATYPE(QMargins)
@@ -805,13 +804,52 @@
}
case DefaultColorsHook: {
- auto map = *reinterpret_cast<QMap<QString, QColor> *>(data);
+ auto &map = *static_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);
+ map.insert(QStringLiteral("activeLight"), kWindowsColorSet.activeLight);
+ map.insert(QStringLiteral("activeDark"), kWindowsColorSet.activeDark);
+ map.insert(QStringLiteral("inactiveLight"), kWindowsColorSet.inactiveLight);
+ map.insert(QStringLiteral("inactiveDark"), kWindowsColorSet.inactiveDark);
return;
+ }
+
+ case DrawWindows10BorderHook: {
+ 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;
+ pen.setWidth(getWindowFrameBorderThickness(hwnd) * 2);
+
+ const bool dark = isDarkThemeActive() && isDarkWindowFrameEnabled(hwnd);
+ if (m_delegate->isWindowActive(m_host)) {
+ 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_windowHandle->width(), 0}
+ });
+ painter.restore();
}
default: {
@@ -822,14 +860,12 @@
AbstractWindowContext::virtual_hook(id, data);
}
- bool Win32WindowContext::needWin10BorderHandler() const {
+ bool Win32WindowContext::needBorderPainter() const {
return isWin10OrGreater() && !isWin11OrGreater();
}
- void Win32WindowContext::setWin10BorderHandler(Win10BorderHandler *handler) {
- win10BorderHandler.reset(handler);
- handler->setBorderThickness(
- int(getWindowFrameBorderThickness(reinterpret_cast<HWND>(windowId))));
+ int Win32WindowContext::borderThickness() const {
+ return getWindowFrameBorderThickness(reinterpret_cast<HWND>(windowId));
}
bool Win32WindowContext::setupHost() {
@@ -897,12 +933,16 @@
return true;
}
+ if (themeStuffHandler(hWnd, message, wParam, lParam, result)) {
+ return true;
+ }
+
return false; // Not handled
}
QWK_USED static constexpr const struct {
- const WPARAM wParam = 0xF1C9ADD4;
- const LPARAM lParam = 0xAFB6F4C6;
+ const WPARAM wParam = MAKEWPARAM(44500, 61897);
+ const LPARAM lParam = MAKELPARAM(62662, 44982); // Not used. Reserve for future use.
} kMessageTag;
static inline quint64 getKeyState() {
@@ -1883,40 +1923,83 @@
return false;
}
- void Win10BorderHandler::paintBorder(QPainter &painter, const QRect &rect,
- const QRegion ®ion) {
- Q_UNUSED(rect)
- Q_UNUSED(region)
+ bool Win32WindowContext::themeStuffHandler(HWND hWnd, UINT message, WPARAM wParam,
+ LPARAM lParam, LRESULT *resul) {
+ switch (message) {
+ case WM_DPICHANGED: {
+ const auto dpiX = UINT(LOWORD(wParam));
+ const auto dpiY = UINT(HIWORD(wParam));
- 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);
+ QEvent e(QEvent::ScreenChangeInternal);
+ dispatch(&e);
+ break;
}
- } else {
- static QColor frameBorderInactiveColorLight(kWindowsColorSet.inactiveLight);
- static QColor frameBorderInactiveColorDark(kWindowsColorSet.inactiveDark);
- pen.setColor(dark ? frameBorderInactiveColorDark : frameBorderInactiveColorLight);
+
+ case WM_THEMECHANGED:
+ case WM_SYSCOLORCHANGE: {
+ QEvent e(QEvent::UpdateRequest);
+ dispatch(&e);
+ break;
+ }
+
+ case WM_DWMCOLORIZATIONCOLORCHANGED: {
+ const QColor color = QColor::fromRgba(wParam);
+ const auto blendWithOpacity = *reinterpret_cast<LPBOOL>(lParam);
+
+ QEvent e(QEvent::UpdateRequest);
+ dispatch(&e);
+ break;
+ }
+
+ case WM_SETTINGCHANGE: {
+ if (!wParam && lParam &&
+ std::wcscmp(reinterpret_cast<LPCWSTR>(lParam), L"ImmersiveColorSet") == 0) {
+ const QColor color = getAccentColor();
+ }
+
+ QEvent e(QEvent::UpdateRequest);
+ dispatch(&e);
+ break;
+ }
+
+ case WM_SIZE: {
+ const bool max = wParam == SIZE_MAXIMIZED;
+ const bool min = wParam == SIZE_MINIMIZED;
+ const bool full = isFullScreen(hWnd);
+
+ Qt::WindowStates states{};
+ if (max) {
+ states |= Qt::WindowMaximized;
+ }
+ if (min) {
+ states |= Qt::WindowMinimized;
+ }
+ if (full) {
+ states |= Qt::WindowFullScreen;
+ }
+
+ QTimer::singleShot(0, this, [this, states] {
+ QWindowStateChangeEvent e(states);
+ dispatch(&e);
+ });
+ break;
+ }
+
+ case WM_ACTIVATE: {
+ const auto state = LOWORD(wParam);
+ const bool active = state == WA_ACTIVE || state == WA_CLICKACTIVE;
+ Q_UNUSED(state)
+
+ QTimer::singleShot(0, this, [this, active] {
+ QEvent e(active ? QEvent::WindowActivate : QEvent::WindowDeactivate);
+ dispatch(&e);
+ });
+ break;
+ }
+ default:
+ break;
}
- 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();
+ return false;
}
}
--
Gitblit v1.9.1