From a81e09bcd3dfe9f7e44db60f9feb02284155aa6b Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周四, 14 12月 2023 14:46:43 +0800
Subject: [PATCH] minor tweaks

---
 src/core/contexts/abstractwindowcontext.cpp |   33 +++++++++++++++++----------------
 1 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 3c902e9..3b2340f 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -7,13 +7,6 @@
 
 namespace QWK {
 
-    QWK_USED static constexpr const struct {
-        const quint32 activeLight = MAKE_RGBA_COLOR(210, 233, 189, 226);
-        const quint32 activeDark = MAKE_RGBA_COLOR(177, 205, 190, 240);
-        const quint32 inactiveLight = MAKE_RGBA_COLOR(193, 195, 211, 203);
-        const quint32 inactiveDark = MAKE_RGBA_COLOR(240, 240, 250, 255);
-    } kSampleColorSet;
-
     AbstractWindowContext::AbstractWindowContext() = default;
 
     AbstractWindowContext::~AbstractWindowContext() = default;
@@ -98,10 +91,6 @@
         return true;
     }
 
-    void AbstractWindowContext::showSystemMenu(const QPoint &pos) {
-        virtual_hook(ShowSystemMenuHook, &const_cast<QPoint &>(pos));
-    }
-
     QRegion AbstractWindowContext::hitTestShape() const {
         if (hitTestVisibleShapeDirty) {
             hitTestVisibleShape = {};
@@ -178,6 +167,13 @@
         return {};
     }
 
+    QWK_USED static constexpr const struct {
+        const quint32 activeLight = MAKE_RGBA_COLOR(210, 233, 189, 226);
+        const quint32 activeDark = MAKE_RGBA_COLOR(177, 205, 190, 240);
+        const quint32 inactiveLight = MAKE_RGBA_COLOR(193, 195, 211, 203);
+        const quint32 inactiveDark = MAKE_RGBA_COLOR(240, 240, 250, 255);
+    } kSampleColorSet;
+
     void AbstractWindowContext::virtual_hook(int id, void *data) {
         switch (id) {
             case CentralizeHook: {
@@ -191,17 +187,22 @@
             }
 
             case DefaultColorsHook: {
-                auto map = *reinterpret_cast<QMap<QString, QColor> *>(data);
+                auto &map = *static_cast<QMap<QString, QColor> *>(data);
                 map.clear();
-                map.insert("activeLight", kSampleColorSet.activeLight);
-                map.insert("activeDark", kSampleColorSet.activeDark);
-                map.insert("inactiveLight", kSampleColorSet.inactiveLight);
-                map.insert("inactiveDark", kSampleColorSet.inactiveDark);
+                map.insert(QStringLiteral("activeLight"), kSampleColorSet.activeLight);
+                map.insert(QStringLiteral("activeDark"), kSampleColorSet.activeDark);
+                map.insert(QStringLiteral("inactiveLight"), kSampleColorSet.inactiveLight);
+                map.insert(QStringLiteral("inactiveDark"), kSampleColorSet.inactiveDark);
                 return;
             }
+
             default:
                 break;
         }
     }
 
+    void AbstractWindowContext::showSystemMenu(const QPoint &pos) {
+        virtual_hook(ShowSystemMenuHook, &const_cast<QPoint &>(pos));
+    }
+
 }
\ No newline at end of file

--
Gitblit v1.9.1