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 | 61 +++++++++++++++++++++---------
1 files changed, 43 insertions(+), 18 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index de9674c..8672faf 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -9,26 +9,48 @@
namespace QWK {
- class WinIdChangeEventFilter : public QObject {
- public:
- explicit WinIdChangeEventFilter(QObject *widget, AbstractWindowContext *ctx,
- QObject *parent = nullptr)
- : QObject(parent), ctx(ctx) {
- widget->installEventFilter(this);
- }
+ namespace {
- protected:
- bool eventFilter(QObject *obj, QEvent *event) override {
- Q_UNUSED(obj)
- if (event->type() == QEvent::WinIdChange) {
- ctx->notifyWinIdChange();
+ class WinIdChangeEventFilter : public QObject {
+ public:
+ explicit WinIdChangeEventFilter(QObject *widget, AbstractWindowContext *ctx,
+ QObject *parent = nullptr)
+ : QObject(parent), ctx(ctx) {
+ widget->installEventFilter(this);
}
- return false;
- }
- protected:
- AbstractWindowContext *ctx;
- };
+ 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;
@@ -45,6 +67,7 @@
m_windowHandle = m_delegate->hostWindow(m_host);
if (m_windowHandle) {
winIdChanged();
+ m_windowEventFilter = std::make_unique<WindowEventFilter>(m_windowHandle, this);
}
}
@@ -245,9 +268,11 @@
m_windowHandle = m_delegate->hostWindow(m_host);
if (oldWindow == m_windowHandle)
return;
+ 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();
--
Gitblit v1.9.1