update

example/qml-Qt6/page/T_Home.qml

@@ -27,7 +27,6 @@ FluScrollablePage{
             id: bg
             fillMode:Image.PreserveAspectCrop
             anchors.fill: parent
-            asynchronous: true
             verticalAlignment: Qt.AlignTop
             sourceSize: Qt.size(960,640)
             source: "qrc:/example/res/image/bg_home_header.png"

example/qml/page/T_Home.qml

@@ -27,7 +27,6 @@ FluScrollablePage{
             id: bg
             fillMode:Image.PreserveAspectCrop
             anchors.fill: parent
-            asynchronous: true
             verticalAlignment: Qt.AlignTop
             sourceSize: Qt.size(960,640)
             source: "qrc:/example/res/image/bg_home_header.png"

example/src/main.cpp

@@ -26,6 +26,9 @@ Q_IMPORT_QML_PLUGIN(FluentUIPlugin)
 int main(int argc, char *argv[])
 {
     qputenv("QT_QUICK_CONTROLS_STYLE","Basic");
+#ifdef Q_OS_WIN
+    qputenv("QT_QPA_PLATFORM","windows:darkmode=2");
+#endif
 #ifdef Q_OS_LINUX
     //fix bug UOSv20 does not print logs
     qputenv("QT_LOGGING_RULES","");
@@ -35,6 +38,7 @@ int main(int argc, char *argv[])
     QGuiApplication::setOrganizationName("ZhuZiChu");
     QGuiApplication::setOrganizationDomain("https://zhuzichu520.github.io");
     QGuiApplication::setApplicationName("FluentUI");
+    QGuiApplication::setApplicationDisplayName("FluentUI Exmaple");
     QGuiApplication::setApplicationVersion(APPLICATION_VERSION);
     SettingsHelper::getInstance()->init(argv);
     Log::setup("example");

example/src/singleton.h

@@ -2,45 +2,32 @@
 #define SINGLETON_H
 
 #include <QMutex>
-#include <QScopedPointer>
-#include <memory>
-#include <mutex>
 
 template <typename T>
 class Singleton {
 public:
     static T* getInstance();
 
-    Singleton(const Singleton& other) = delete;
-    Singleton<T>& operator=(const Singleton& other) = delete;
-
 private:
-    static std::mutex mutex;
+    Q_DISABLE_COPY_MOVE(Singleton)
-    static T* instance;
 };
 
-template <typename T>
-std::mutex Singleton<T>::mutex;
-template <typename T>
-T* Singleton<T>::instance;
 template <typename T>
 T* Singleton<T>::getInstance() {
+    static QMutex mutex;
+    QMutexLocker locker(&mutex);
+    static T* instance = nullptr;
     if (instance == nullptr) {
-        std::lock_guard<std::mutex> locker(mutex);
+        instance = new T();
-        if (instance == nullptr) {
-            instance = new T();
-        }
     }
     return instance;
 }
 
-#define SINGLETON(Class)                              \
+#define SINGLETON(Class)                        \
-private:                                               \
+private:                                        \
     friend class Singleton<Class>;              \
-    friend struct QScopedPointerDeleter<Class>;        \
+    public:                                     \
-                                                       \
+    static Class* getInstance() {               \
-    public:                                                \
-    static Class* getInstance() {                      \
         return Singleton<Class>::getInstance(); \
 }
 
@@ -48,6 +35,6 @@ private:                                               \
 private:                                \
     Class() = default;                  \
     Class(const Class& other) = delete; \
-    Class& operator=(const Class& other) = delete;
+    Q_DISABLE_COPY_MOVE(Class);
 
 #endif // SINGLETON_H

src/Qt5/imports/FluentUI/Controls/FluComboBox.qml

@@ -102,6 +102,7 @@ T.ComboBox {
         height: Math.min(contentItem.implicitHeight, control.Window.height - topMargin - bottomMargin)
         topMargin: 6
         bottomMargin: 6
+        modal: true
         contentItem: ListView {
             clip: true
             implicitHeight: contentHeight

src/Qt6/imports/FluentUI/Controls/FluComboBox.qml

@@ -102,6 +102,7 @@ T.ComboBox {
         height: Math.min(contentItem.implicitHeight, control.Window.height - topMargin - bottomMargin)
         topMargin: 6
         bottomMargin: 6
+        modal: true
         contentItem: ListView {
             clip: true
             implicitHeight: contentHeight

src/singleton.h

@@ -23,12 +23,11 @@ T* Singleton<T>::getInstance() {
     return instance;
 }
 
-#define SINGLETON(Class)                              \
+#define SINGLETON(Class)                        \
-private:                                               \
+private:                                        \
     friend class Singleton<Class>;              \
-                                                       \
+    public:                                     \
-    public:                                                \
+    static Class* getInstance() {               \
-    static Class* getInstance() {                      \
         return Singleton<Class>::getInstance(); \
 }