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

---
 src/core/contexts/abstractwindowcontext.cpp |   59 ++++++++++++++++++++++-------------------------------------
 1 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 1669cd4..d110fff 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -18,22 +18,32 @@
         }
         m_host = host;
         m_delegate.reset(delegate);
-        setEnabled(true);
+
+        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.value() == attribute)
+            return true;
 
-        auto newVar = var;
+        auto newVar = attribute;
         auto oldVar = it.value();
-        void *a[] = {
+        bool res = false;
+        void *args[] = {
             &const_cast<QString &>(key),
             &newVar,
             &oldVar,
+            &res,
         };
-        virtual_hook(WindowAttributeChangedHook, a);
+        virtual_hook(WindowAttributeChangedHook, args);
+        if (res) {
+            it.value() = newVar;
+        }
+        return res;
     }
 
     bool AbstractWindowContext::setHitTestVisible(const QObject *obj, bool visible) {
@@ -152,6 +162,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 +203,11 @@
     }
 
     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);
-    }
-
-    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);
+        winIdChanged();
     }
 
 }

--
Gitblit v1.9.1