update

zhuzichu520 · Apr 13, 2024 · e8c47e0 · e8c47e0
1 parent 9296b18
commit e8c47e0
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 8 deletions.
diff --git a/example/qml/page/T_Theme.qml b/example/qml/page/T_Theme.qml
@@ -13,7 +13,7 @@ FluScrollablePage{
 
     FluFrame{
         Layout.fillWidth: true
-        Layout.preferredHeight: 400
+        Layout.preferredHeight: 420
         padding: 10
 
         ColumnLayout{

diff --git a/src/FluTheme.cpp b/src/FluTheme.cpp
@@ -3,6 +3,7 @@
 #include <QGuiApplication>
 #include <QPalette>
 #include <QImage>
+#include <QThreadPool>
 #include "Def.h"
 #include "FluentIconDef.h"
 #include "FluColors.h"
@@ -91,14 +92,18 @@ bool FluTheme::dark() const {
 }
 
 void FluTheme::updateDesktopImage(){
-    auto path = FluTools::getInstance()->getWallpaperFilePath();
-    if(_desktopImagePath != path){
-        if(!_desktopImagePath.isEmpty()){
-            _watcher.removePath(_desktopImagePath);
+    QThreadPool::globalInstance()->start([=]() {
+        _mutex.lock();
+        auto path = FluTools::getInstance()->getWallpaperFilePath();
+        if(_desktopImagePath != path){
+            if(!_desktopImagePath.isEmpty()){
+                _watcher.removePath(_desktopImagePath);
+            }
+            desktopImagePath(path);
+            _watcher.addPath(path);
         }
-        desktopImagePath(path);
-        _watcher.addPath(path);
-    }
+        _mutex.unlock();
+    });
 }
 
 void FluTheme::timerEvent(QTimerEvent *event)

diff --git a/src/FluTheme.h b/src/FluTheme.h
@@ -8,6 +8,7 @@
 #include <QColor>
 #include <QTimer>
 #include <QFileSystemWatcher>
+#include <QMutex>
 #include "FluAccentColor.h"
 #include "stdafx.h"
 #include "singleton.h"
@@ -70,6 +71,7 @@ SINGLETON(FluTheme)
 private:
     bool _systemDark;
     QFileSystemWatcher _watcher;
+    QMutex _mutex;
 };
 
 #endif // FLUTHEME_H
diff --git a/src/FluTools.cpp b/src/FluTools.cpp
@@ -281,6 +281,18 @@ QString FluTools::getWallpaperFilePath() {
             return path;
         }
     }
+#elif defined(Q_OS_MACOS)
+    QProcess process;
+    QStringList args;
+    args << "-e";
+    args << R"(tell application "Finder" to get POSIX path of (desktop picture as alias))";
+    process.start("osascript", args);
+    process.waitForFinished();
+    QByteArray result = process.readAllStandardOutput().trimmed();
+    if(result.isEmpty()){
+        return "/System/Library/CoreServices/DefaultDesktop.heic";
+    }
+    return result;
 #else
     return {};
 #endif