From e331fb1feda8891baba2a2dc1caeed67834d9d93 Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周五, 22 12月 2023 23:47:22 +0800
Subject: [PATCH] improve dark mode on win
---
src/core/contexts/abstractwindowcontext.cpp | 121 +++++++++++++++++++++++++++-------------
1 files changed, 81 insertions(+), 40 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 1669cd4..d2da16f 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -3,10 +3,32 @@
#include <QtGui/QPen>
#include <QtGui/QPainter>
#include <QtGui/QScreen>
+#include <memory>
#include "qwkglobal_p.h"
namespace QWK {
+
+ class WinIdChangeEventFilter : public QObject {
+ public:
+ explicit WinIdChangeEventFilter(QObject *widget, AbstractWindowContext *ctx,
+ QObject *parent = nullptr)
+ : QObject(parent), ctx(ctx) {
+ widget->installEventFilter(this);
+ }
+
+ protected:
+ bool eventFilter(QObject *obj, QEvent *event) override {
+ Q_UNUSED(obj)
+ if (event->type() == QEvent::WinIdChange) {
+ ctx->notifyWinIdChange();
+ }
+ return false;
+ }
+
+ protected:
+ AbstractWindowContext *ctx;
+ };
AbstractWindowContext::AbstractWindowContext() = default;
@@ -18,22 +40,39 @@
}
m_host = host;
m_delegate.reset(delegate);
- setEnabled(true);
+ m_winIdChangeEventFilter = std::make_unique<WinIdChangeEventFilter>(host, this);
+
+ m_windowHandle = m_delegate->hostWindow(m_host);
+ if (m_windowHandle) {
+ winIdChanged();
+ }
}
- void AbstractWindowContext::setWindowAttribute(const QString &key, const QVariant &var) {
+ bool AbstractWindowContext::setWindowAttribute(const QString &key, const QVariant &attribute) {
auto it = m_windowAttributes.find(key);
- if (it.value() == var)
- return;
+ if (it == m_windowAttributes.end()) {
+ if (!attribute.isValid()) {
+ return true;
+ }
+ if (m_windowHandle && !windowAttributeChanged(key, attribute, {})) {
+ return false;
+ }
+ m_windowAttributes.insert(key, attribute);
+ return true;
+ }
- auto newVar = var;
- auto oldVar = it.value();
- void *a[] = {
- &const_cast<QString &>(key),
- &newVar,
- &oldVar,
- };
- virtual_hook(WindowAttributeChangedHook, a);
+ if (it.value() == attribute)
+ return true;
+ if (m_windowHandle && !windowAttributeChanged(key, attribute, it.value())) {
+ return false;
+ }
+
+ if (attribute.isValid()) {
+ it.value() = attribute;
+ } else {
+ m_windowAttributes.erase(it);
+ }
+ return true;
}
bool AbstractWindowContext::setHitTestVisible(const QObject *obj, bool visible) {
@@ -69,6 +108,15 @@
if (m_titleBar == item) {
return false;
}
+
+ if (m_titleBar) {
+ // Since the title bar is changed, all items inside it should be dereferenced right away
+ for (auto &button : m_systemButtons) {
+ button = nullptr;
+ }
+ m_hitTestVisibleItems.clear();
+ }
+
m_titleBar = item;
return true;
}
@@ -152,6 +200,9 @@
void AbstractWindowContext::virtual_hook(int id, void *data) {
switch (id) {
case CentralizeHook: {
+ if (!m_windowHandle)
+ return;
+
QRect screenGeometry = m_windowHandle->screen()->geometry();
int x = (screenGeometry.width() - m_windowHandle->width()) / 2;
int y = (screenGeometry.height() - m_windowHandle->height()) / 2;
@@ -190,39 +241,29 @@
}
void AbstractWindowContext::notifyWinIdChange() {
- if (!m_internalEnabled)
- return;
-
auto oldWindow = m_windowHandle;
+ m_windowHandle = m_delegate->hostWindow(m_host);
if (oldWindow == m_windowHandle)
return;
- auto isDestroyed = oldWindow && m_windowHandleCache.isNull();
- m_windowHandle = m_delegate->window(m_host);
- m_windowHandleCache = m_windowHandle;
- winIdChanged(oldWindow, isDestroyed);
+ winIdChanged();
+
+ if (m_windowHandle) {
+ // Refresh window attributes
+ auto attributes = m_windowAttributes;
+ m_windowAttributes.clear();
+ for (auto it = attributes.begin(); it != attributes.end(); ++it) {
+ if (!windowAttributeChanged(it.key(), it.value(), {})) {
+ continue;
+ }
+ m_windowAttributes.insert(it.key(), it.value());
+ }
+ }
}
- void AbstractWindowContext::setEnabled(bool enabled) {
- if (enabled == m_internalEnabled)
- return;
- m_internalEnabled = enabled;
-
- if (enabled) {
- m_windowHandle = m_delegate->window(m_host);
- m_windowHandleCache = m_windowHandle;
- if (m_windowHandle) {
- winIdChanged(nullptr, false);
- }
- return;
- }
-
- if (!m_windowHandle)
- return;
-
- auto oldWindow = m_windowHandle;
- m_windowHandle = nullptr;
- m_windowHandleCache.clear();
- winIdChanged(oldWindow, false);
+ bool AbstractWindowContext::windowAttributeChanged(const QString &key,
+ const QVariant &attribute,
+ const QVariant &oldAttribute) {
+ return false;
}
}
--
Gitblit v1.9.1