Merge cb4ec62c1e into db0588edcd

修复FluCarousel手动翻页的问题

example/src/AppInfo.h

@@ -13,6 +13,6 @@ class AppInfo : public QObject {
   explicit AppInfo(QObject *parent = nullptr);
 
  public:
-  SINGLETON(AppInfo)
+  EXAMPLESINGLETON(AppInfo)
   [[maybe_unused]] Q_INVOKABLE void testCrash();
 };

example/src/helper/InitializrHelper.h

@@ -15,7 +15,7 @@ private:
     void templateToFile(const QString &source, const QString &dest, Args &&...args);
 
 public:
-    SINGLETON(InitializrHelper)
+    EXAMPLESINGLETON(InitializrHelper)
     ~InitializrHelper() override;
     [[maybe_unused]] Q_INVOKABLE void generate(const QString &name, const QString &path);
     Q_SIGNAL void error(const QString &message);

example/src/helper/Network.h

@@ -144,7 +144,7 @@ private:
     explicit Network(QObject *parent = nullptr);
 
 public:
-    SINGLETON(Network)
+    EXAMPLESINGLETON(Network)
 
     static Network *create(QQmlEngine *qmlEngine, QJSEngine *jsEngine) {
         return getInstance();

example/src/helper/SettingsHelper.h

@@ -15,7 +15,7 @@ private:
     explicit SettingsHelper(QObject *parent = nullptr);
 
 public:
-    SINGLETON(SettingsHelper)
+    EXAMPLESINGLETON(SettingsHelper)
     ~SettingsHelper() override;
     void init(char *argv[]);
     Q_INVOKABLE void saveDarkMode(int darkModel) {

example/src/helper/TranslateHelper.h

@@ -14,7 +14,7 @@ private:
     [[maybe_unused]] explicit TranslateHelper(QObject *parent = nullptr);
 
 public:
-    SINGLETON(TranslateHelper)
+    EXAMPLESINGLETON(TranslateHelper)
     ~TranslateHelper() override;
     void init(QQmlEngine *engine);
 

example/src/singleton.h

@@ -4,22 +4,22 @@
  * @brief The Singleton class
  */
 template <typename T>
-class Singleton {
+class ExampleSingleton {
 public:
     static T *getInstance();
 };
 
 template <typename T>
-T *Singleton<T>::getInstance() {
+T *ExampleSingleton<T>::getInstance() {
     static T *instance = new T();
     return instance;
 }
 
-#define SINGLETON(Class)                                                                           \
+#define EXAMPLESINGLETON(Class)                                                                           \
 private:                                                                                           \
-    friend class Singleton<Class>;                                                                 \
+    friend class ExampleSingleton<Class>;                                                                 \
                                                                                                    \
 public:                                                                                            \
     static Class *getInstance() {                                                                  \
-        return Singleton<Class>::getInstance();                                                    \
+        return ExampleSingleton<Class>::getInstance();                                                    \
     }

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

@@ -24,7 +24,7 @@ Item {
     }
     QtObject{
         id:d
-        property bool flagXChanged: true
+        property bool flagXChanged: false
         property bool isAnimEnable: control.autoPlay && list_view.count>3
         function setData(data){
             if(!data){
@@ -88,15 +88,18 @@ Item {
             }
         }
         onMovementEnded:{
+            d.flagXChanged = false
+            list_view.highlightMoveDuration = 0
             currentIndex = list_view.contentX/list_view.width
             if(currentIndex === 0){
                 currentIndex = list_view.count-2
             }else if(currentIndex === list_view.count-1){
                 currentIndex = 1
             }
-            d.flagXChanged = false
+            if(d.isAnimEnable){
                 timer_run.restart()
             }
+        }
         onMovementStarted: {
             d.flagXChanged = true
             timer_run.stop()
@@ -104,12 +107,12 @@ Item {
         onContentXChanged: {
             if(d.flagXChanged){
                 var maxX = Math.min(list_view.width*(currentIndex+1),list_view.count*list_view.width)
-                var minY = Math.max(0,(list_view.width*(currentIndex-1)))
+                var minX = Math.max(0,(list_view.width*(currentIndex-1)))
                 if(contentX>=maxX){
                     contentX = maxX
                 }
-                if(contentX<=minY){
+                if(contentX<=minX){
-                    contentX = minY
+                    contentX = minX
                 }
             }
         }

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

@@ -14,13 +14,6 @@ ProgressBar{
         id:d
         property real _radius: strokeWidth/2
     }
-    onIndeterminateChanged:{
-        if(!indeterminate){
-            animator_x.duration = 0
-            rect_progress.x = 0
-            animator_x.duration = control.duration
-        }
-    }
     background: Rectangle {
         implicitWidth: 150
         implicitHeight: control.strokeWidth
@@ -45,6 +38,11 @@ ProgressBar{
                 id: animator_x
                 running: control.indeterminate && control.visible
                 loops: Animation.Infinite
+                onRunningChanged: {
+                    if(!running){
+                        rect_progress.x = 0
+                    }
+                }
                 PropertyAnimation {
                     from: -rect_progress.width
                     to: control.width + rect_progress.width

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

@@ -24,7 +24,7 @@ Item {
     }
     QtObject{
         id:d
-        property bool flagXChanged: true
+        property bool flagXChanged: false
         property bool isAnimEnable: control.autoPlay && list_view.count>3
         function setData(data){
             if(!data){
@@ -88,15 +88,18 @@ Item {
             }
         }
         onMovementEnded:{
+            d.flagXChanged = false
+            list_view.highlightMoveDuration = 0
             currentIndex = list_view.contentX/list_view.width
             if(currentIndex === 0){
                 currentIndex = list_view.count-2
             }else if(currentIndex === list_view.count-1){
                 currentIndex = 1
             }
-            d.flagXChanged = false
+            if(d.isAnimEnable){
                 timer_run.restart()
             }
+        }
         onMovementStarted: {
             d.flagXChanged = true
             timer_run.stop()
@@ -104,12 +107,12 @@ Item {
         onContentXChanged: {
             if(d.flagXChanged){
                 var maxX = Math.min(list_view.width*(currentIndex+1),list_view.count*list_view.width)
-                var minY = Math.max(0,(list_view.width*(currentIndex-1)))
+                var minX = Math.max(0,(list_view.width*(currentIndex-1)))
                 if(contentX>=maxX){
                     contentX = maxX
                 }
-                if(contentX<=minY){
+                if(contentX<=minX){
-                    contentX = minY
+                    contentX = minX
                 }
             }
         }

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

@@ -15,13 +15,6 @@ ProgressBar{
         id:d
         property real _radius: strokeWidth/2
     }
-    onIndeterminateChanged:{
-        if(!indeterminate){
-            animator_x.duration = 0
-            rect_progress.x = 0
-            animator_x.duration = control.duration
-        }
-    }
     background: Rectangle {
         implicitWidth: 150
         implicitHeight: control.strokeWidth
@@ -46,6 +39,11 @@ ProgressBar{
                 id: animator_x
                 running: control.indeterminate && control.visible
                 loops: Animation.Infinite
+                onRunningChanged: {
+                    if(!running){
+                        rect_progress.x = 0
+                    }
+                }
                 PropertyAnimation {
                     from: -rect_progress.width
                     to: control.width + rect_progress.width