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 |   48 +++++++++++++++++++++++++++++++-----------------
 1 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 5ce7c8c..d110fff 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -18,25 +18,32 @@
         }
         m_host = host;
         m_delegate.reset(delegate);
+
         m_windowHandle = m_delegate->hostWindow(m_host);
         if (m_windowHandle) {
-            winIdChanged(nullptr);
+            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) {
@@ -155,18 +162,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 +204,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