From 862cbfe3032b1f71977fb66af7bd87645ec3eeac Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周四, 21 12月 2023 23:27:04 +0800
Subject: [PATCH] minor tweaks

---
 src/core/contexts/abstractwindowcontext.cpp |   77 +++++++++++++++++++++++++-------------
 1 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 5ce7c8c..0d72e3c 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,25 +40,12 @@
         }
         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();
         }
-    }
-
-    void AbstractWindowContext::setWindowAttribute(const QString &key, const QVariant &var) {
-        auto it = m_windowAttributes.find(key);
-        if (it.value() == var)
-            return;
-
-        auto newVar = var;
-        auto oldVar = it.value();
-        void *a[] = {
-            &const_cast<QString &>(key),
-            &newVar,
-            &oldVar,
-        };
-        virtual_hook(WindowAttributeChangedHook, a);
     }
 
     bool AbstractWindowContext::setHitTestVisible(const QObject *obj, bool visible) {
@@ -72,6 +81,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;
     }
@@ -155,18 +173,25 @@
     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() / 2 - m_windowHandle->width() / 2;
-                int y = screenGeometry.height() / 2 - m_windowHandle->height() / 2;
-                m_windowHandle->setPosition(x, y);
-                break;
+                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 RaiseWindowHook: {
-                if (m_windowHandle->windowStates() & Qt::WindowMinimized)
-                    m_windowHandle->showNormal();
-                m_windowHandle->raise();
-                break;
+                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: {
@@ -190,10 +215,10 @@
 
     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);
+        winIdChanged();
     }
 
 }

--
Gitblit v1.9.1