From 0f478c87fe7dbc8758b5b0f68e52beee867ed114 Mon Sep 17 00:00:00 2001
From: x-tools-author <x-tools@outlook.com>
Date: Fri, 29 Mar 2024 00:35:25 +0800
Subject: [PATCH] chore: update files of project

---
 Source/Common/Common/xToolsApplication.cpp  |  3 +++
 Source/Common/Common/xToolsSettings.cpp     | 16 +++++++++++-----
 Source/Common/CommonUI/xTools.h             |  6 ++++--
 Source/Common/CommonUI/xToolsMainWindow.cpp |  4 ----
 Source/ToolBox/ToolBoxUI/xToolsToolBoxUi.ui |  4 ++--
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/Source/Common/Common/xToolsApplication.cpp b/Source/Common/Common/xToolsApplication.cpp
index fc412929..1e106e46 100644
--- a/Source/Common/Common/xToolsApplication.cpp
+++ b/Source/Common/Common/xToolsApplication.cpp
@@ -28,11 +28,14 @@
 #include <QTextDocument>
 #include <QTranslator>
 
+#include "xTools.h"
 #include "xToolsSettings.h"
 
 xToolsApplication::xToolsApplication(int argc, char *argv[])
     : QApplication(argc, argv)
 {
+    xToolsInitAppStyle();
+
     m_languageFlagNameMap.insert("zh_CN", "简体中文");
     m_languageFlagNameMap.insert("en", "English");
 #if 0
diff --git a/Source/Common/Common/xToolsSettings.cpp b/Source/Common/Common/xToolsSettings.cpp
index 4e8eb148..6d4c66ca 100644
--- a/Source/Common/Common/xToolsSettings.cpp
+++ b/Source/Common/Common/xToolsSettings.cpp
@@ -12,6 +12,7 @@
 #include <QDesktopServices>
 #include <QStandardPaths>
 #include <QUrl>
+#include <QStyle>
 
 static const QString fileName()
 {
@@ -74,11 +75,16 @@ void xToolsSettings::setHdpiPolicy(int policy)
 
 QString xToolsSettings::appStyle()
 {
-#ifdef X_TOOLS_DEFAULT_APP_STYLE
-    return value(mSettingsKey.appStyle, X_TOOLS_DEFAULT_APP_STYLE).toString();
-#else
-    return QString("Fusion");
-#endif
+    auto var = value(mSettingsKey.appStyle);
+    if (var.isValid()) {
+        return value(mSettingsKey.appStyle).toString();
+    }
+
+    if (QApplication::instance()) {
+        return QApplication::style()->objectName();
+    }
+
+    return QString("");
 }
 
 void xToolsSettings::setAppStyle(const QString& style)
diff --git a/Source/Common/CommonUI/xTools.h b/Source/Common/CommonUI/xTools.h
index a847803f..5780e037 100644
--- a/Source/Common/CommonUI/xTools.h
+++ b/Source/Common/CommonUI/xTools.h
@@ -150,7 +150,10 @@ static void xToolsInitAppStyle()
     const QStringList keys = QStyleFactory::keys();
     qInfo() << "The supported application styles are:" << qPrintable(keys.join(QChar(',')));
     const QString style = xToolsSettings::instance()->appStyle();
-    if (keys.contains(style)) {
+    if (style.isEmpty()) {
+        qWarning() << "The application style is not specified, the default style is:"
+                   << qPrintable(QApplication::style()->objectName());
+    } else if (keys.contains(style)) {
         qInfo() << "The current style of application is:" << qPrintable(style);
         QApplication::setStyle(QStyleFactory::create(style));
     }
@@ -167,7 +170,6 @@ static void sakDoSomethingBeforeAppCreated(char *argv[], const QString &appName)
 #endif
     xToolsTryToClearSettings();
     xToolsInitHdpi();
-    xToolsInitAppStyle();
 }
 
 static void sakDoSomethingAfterAppExited()
diff --git a/Source/Common/CommonUI/xToolsMainWindow.cpp b/Source/Common/CommonUI/xToolsMainWindow.cpp
index 9b55d16e..efef7323 100644
--- a/Source/Common/CommonUI/xToolsMainWindow.cpp
+++ b/Source/Common/CommonUI/xToolsMainWindow.cpp
@@ -152,10 +152,6 @@ void xToolsMainWindow::initOptionMenuAppStyleMenu()
     m_optionMenu->addMenu(appStyleMenu);
     QStringList keys = QStyleFactory::keys();
     QString style = xToolsSettings::instance()->appStyle();
-    if (style.isEmpty() && keys.contains(QString("Funsion"))) {
-        style = "Funsion";
-    }
-
     for (QString& key : keys) {
         QAction* action = new QAction(key, this);
         action->setObjectName(key);
diff --git a/Source/ToolBox/ToolBoxUI/xToolsToolBoxUi.ui b/Source/ToolBox/ToolBoxUI/xToolsToolBoxUi.ui
index db3b08dc..bc82c5a2 100644
--- a/Source/ToolBox/ToolBoxUI/xToolsToolBoxUi.ui
+++ b/Source/ToolBox/ToolBoxUI/xToolsToolBoxUi.ui
@@ -236,7 +236,7 @@
            <property name="sizeHint" stdset="0">
             <size>
              <width>20</width>
-             <height>8</height>
+             <height>16</height>
             </size>
            </property>
           </spacer>
@@ -255,7 +255,7 @@
         <property name="sizeHint" stdset="0">
          <size>
           <width>20</width>
-          <height>8</height>
+          <height>16</height>
          </size>
         </property>
        </spacer>