From 29901fc2a97eedd3c914f807d1819c9ea7e69973 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周一, 25 12月 2023 17:53:34 +0800
Subject: [PATCH] Optimize Windows 10 border handling
---
src/core/contexts/abstractwindowcontext.cpp | 139 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 125 insertions(+), 14 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index ef1efbf..8672faf 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -2,10 +2,55 @@
#include <QtGui/QPen>
#include <QtGui/QPainter>
+#include <QtGui/QScreen>
+#include <memory>
#include "qwkglobal_p.h"
namespace QWK {
+
+ namespace {
+
+ 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;
+ };
+
+ class WindowEventFilter : public QObject {
+ public:
+ explicit WindowEventFilter(QWindow *window, AbstractWindowContext *ctx,
+ QObject *parent = nullptr)
+ : QObject(parent), ctx(ctx), window(window) {
+ window->installEventFilter(this);
+ }
+
+ protected:
+ bool eventFilter(QObject *obj, QEvent *event) override {
+ return ctx->sharedDispatch(obj, event);
+ }
+
+ protected:
+ AbstractWindowContext *ctx;
+ QWindow *window;
+ };
+
+ }
AbstractWindowContext::AbstractWindowContext() = default;
@@ -17,10 +62,40 @@
}
m_host = host;
m_delegate.reset(delegate);
+ m_winIdChangeEventFilter = std::make_unique<WinIdChangeEventFilter>(host, this);
+
m_windowHandle = m_delegate->hostWindow(m_host);
if (m_windowHandle) {
- winIdChanged(nullptr);
+ winIdChanged();
+ m_windowEventFilter = std::make_unique<WindowEventFilter>(m_windowHandle, this);
}
+ }
+
+ bool AbstractWindowContext::setWindowAttribute(const QString &key, const QVariant &attribute) {
+ auto it = m_windowAttributes.find(key);
+ 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;
+ }
+
+ 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) {
@@ -39,9 +114,8 @@
bool AbstractWindowContext::setSystemButton(WindowAgentBase::SystemButton button,
QObject *obj) {
- Q_ASSERT(obj);
Q_ASSERT(button != WindowAgentBase::Unknown);
- if (!obj || (button == WindowAgentBase::Unknown)) {
+ if (button == WindowAgentBase::Unknown) {
return false;
}
@@ -54,13 +128,18 @@
bool AbstractWindowContext::setTitleBar(QObject *item) {
Q_ASSERT(item);
- if (!item) {
- return false;
- }
-
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;
}
@@ -144,13 +223,25 @@
void AbstractWindowContext::virtual_hook(int id, void *data) {
switch (id) {
case CentralizeHook: {
- // TODO: Qt
- break;
+ 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;
+ QPoint pos(x, y);
+ pos += screenGeometry.topLeft();
+ m_windowHandle->setPosition(pos);
+ return;
}
- case ShowSystemMenuHook: {
- // TODO: Qt
- break;
+ case RaiseWindowHook: {
+ Qt::WindowStates state = m_delegate->getWindowState(m_host);
+ if (state & Qt::WindowMinimized) {
+ m_delegate->setWindowState(m_host, state & ~Qt::WindowMinimized);
+ }
+ m_delegate->bringWindowToTop(m_host);
+ return;
}
case DefaultColorsHook: {
@@ -174,10 +265,30 @@
void AbstractWindowContext::notifyWinIdChange() {
auto oldWindow = m_windowHandle;
- m_windowHandle = m_delegate->window(m_host);
+ m_windowHandle = m_delegate->hostWindow(m_host);
if (oldWindow == m_windowHandle)
return;
- winIdChanged(oldWindow);
+ m_windowEventFilter.reset();
+ winIdChanged();
+ if (m_windowHandle) {
+ m_windowEventFilter = std::make_unique<WindowEventFilter>(m_windowHandle, this);
+
+ // 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());
+ }
+ }
+ }
+
+ bool AbstractWindowContext::windowAttributeChanged(const QString &key,
+ const QVariant &attribute,
+ const QVariant &oldAttribute) {
+ return false;
}
}
--
Gitblit v1.9.1