.github/workflows/macos.yml

@@ -60,7 +60,7 @@ jobs:
           # 拷贝依赖
           sudo macdeployqt bin/Release/${targetName}.app -qmldir=. -dmg     
           
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v2
         with:
           name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}
           path: bin/release/${{ env.targetName }}.app

.github/workflows/ubuntu.yml

@@ -69,11 +69,6 @@ jobs:
       - name: Check if svg file exists
         run: if [ ! -f "${targetName}.svg" ]; then echo "File not found, creating..."; touch ${targetName}.svg; fi
 
-      - name: Copy translation files
-        run: |
-          mkdir -p bin/release/usr/bin/
-          cp -r bin/Release/i18n/ bin/release/usr/bin/i18n/
-
       - name: package
         run: |
           # make sure Qt plugin finds QML sources so it can deploy the imported files
@@ -82,7 +77,7 @@ jobs:
           linuxdeploy-x86_64.AppImage --plugin=qt --output=appimage --create-desktop-file --icon-file=${targetName}.svg --executable=bin/Release/${targetName} --appdir bin/release/
           mv ${{ env.targetName }}-*.AppImage ${{ env.targetName }}.AppImage
         
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v2
         with:
           name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}
           path: ${{ env.targetName }}.AppImage

.github/workflows/windows-mingw.yml

@@ -82,7 +82,7 @@ jobs:
            $name = ${env:archiveName}
            echo "::set-output name=packageName::$name"       
       
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v2
         with:
           name: ${{ steps.package.outputs.packageName }}
           path: dist

.github/workflows/windows-qt5.yml

@@ -69,7 +69,7 @@ jobs:
            $name = ${env:archiveName}
            echo "::set-output name=packageName::$name"     
            
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v2
         with:
           name: ${{ steps.package.outputs.packageName }}
           path: dist

.github/workflows/windows.yml

@@ -76,7 +76,7 @@ jobs:
            $name = ${env:archiveName}
            echo "::set-output name=packageName::$name"     
            
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v2
         with:
           name: ${{ steps.package.outputs.packageName }}
           path: dist

.vscode/settings.json

@@ -1,20 +0,0 @@
-{
-    "MicroPython.executeButton": [
-        {
-            "text": "▶",
-            "tooltip": "运行",
-            "alignment": "left",
-            "command": "extension.executeFile",
-            "priority": 3.5
-        }
-    ],
-    "MicroPython.syncButton": [
-        {
-            "text": "$(sync)",
-            "tooltip": "同步",
-            "alignment": "left",
-            "command": "extension.execute",
-            "priority": 4
-        }
-    ]
-}

README.md

@@ -1,5 +1,3 @@
-# ATTENTION! 
-# PLEASE USE THE BRAND NEW [FluentUI Pro](https://github.com/zhuzichu520/FluentUI2) INSTEAD!
 <div align=center>
 <img width=64 src="doc/preview/fluent_design.svg">
 

example/CMakeLists.txt

@@ -24,8 +24,8 @@ else ()
 endif ()
 
 #导入Qt相关依赖包
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Quick Svg Network Widgets)
+find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Quick Svg Network)
-find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Quick Svg Network Widgets)
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Quick Svg Network)
 
 #添加国际化脚本
 find_program(QT_LUPDATE NAMES lupdate lupdate-qt6)
@@ -141,7 +141,6 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
         Qt${QT_VERSION_MAJOR}::Quick
         Qt${QT_VERSION_MAJOR}::Svg
         Qt${QT_VERSION_MAJOR}::Network
-	Qt${QT_VERSION_MAJOR}::Widgets
         fluentuiplugin
 )
 

example/example_en_US.ts

@@ -639,7 +639,7 @@
     </message>
     <message>
         <location filename="qml/window/MainWindow.qml" line="95"/>
-        <location filename="qml/window/MainWindow.qml" line="337"/>
+        <location filename="qml/window/MainWindow.qml" line="339"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -659,57 +659,57 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="302"/>
+        <location filename="qml/window/MainWindow.qml" line="304"/>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="303"/>
+        <location filename="qml/window/MainWindow.qml" line="305"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="304"/>
+        <location filename="qml/window/MainWindow.qml" line="306"/>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="308"/>
+        <location filename="qml/window/MainWindow.qml" line="310"/>
         <source>Dark Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="308"/>
+        <location filename="qml/window/MainWindow.qml" line="310"/>
         <source>Here you can switch to night mode.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="310"/>
+        <location filename="qml/window/MainWindow.qml" line="312"/>
         <source>Hide Easter eggs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="310"/>
+        <location filename="qml/window/MainWindow.qml" line="312"/>
         <source>Try a few more clicks!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="334"/>
+        <location filename="qml/window/MainWindow.qml" line="336"/>
         <source>Upgrade Tips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="335"/>
+        <location filename="qml/window/MainWindow.qml" line="337"/>
         <source>FluentUI is currently up to date </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="335"/>
+        <location filename="qml/window/MainWindow.qml" line="337"/>
         <source> -- The current app version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="335"/>
+        <location filename="qml/window/MainWindow.qml" line="337"/>
         <source> 
 Now go and download the new version？
 
@@ -718,17 +718,17 @@ Updated content:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="338"/>
+        <location filename="qml/window/MainWindow.qml" line="340"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="365"/>
+        <location filename="qml/window/MainWindow.qml" line="367"/>
         <source>The current version is already the latest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="372"/>
+        <location filename="qml/window/MainWindow.qml" line="374"/>
         <source>The network is abnormal</source>
         <translation type="unfinished"></translation>
     </message>
@@ -831,25 +831,9 @@ Updated content:
     <name>T_Acrylic</name>
     <message>
         <location filename="qml/page/T_Acrylic.qml" line="10"/>
-        <location filename="qml/page/T_Acrylic.qml" line="72"/>
         <source>Acrylic</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="qml/page/T_Acrylic.qml" line="15"/>
-        <source>tintColor:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Acrylic.qml" line="25"/>
-        <source>tintOpacity:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Acrylic.qml" line="36"/>
-        <source>blurRadius:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>T_Badge</name>
@@ -879,22 +863,11 @@ Updated content:
         <source>BreadcurmbBar</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="qml/page/T_BreadcrumbBar.qml" line="15"/>
-        <source>Item_%1</source>
-        <oldsource>Item_&apos;%1&apos;</oldsource>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="qml/page/T_BreadcrumbBar.qml" line="50"/>
         <source>Reset sample</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="qml/page/T_BreadcrumbBar.qml" line="54"/>
-        <source>Item_</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>T_BubbleChart</name>
@@ -929,7 +902,7 @@ Updated content:
         <location filename="qml/page/T_Buttons.qml" line="199"/>
         <location filename="qml/page/T_Buttons.qml" line="320"/>
         <location filename="qml/page/T_Buttons.qml" line="368"/>
-        <location filename="qml/page/T_Buttons.qml" line="419"/>
+        <location filename="qml/page/T_Buttons.qml" line="421"/>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -969,16 +942,10 @@ Updated content:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_Buttons.qml" line="222"/>
         <location filename="qml/page/T_Buttons.qml" line="238"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="qml/page/T_Buttons.qml" line="238"/>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="qml/page/T_Buttons.qml" line="270"/>
         <source>Click IconButton</source>
@@ -1055,12 +1022,12 @@ Updated content:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_Buttons.qml" line="407"/>
+        <location filename="qml/page/T_Buttons.qml" line="408"/>
         <source>Radio Button_2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_Buttons.qml" line="410"/>
+        <location filename="qml/page/T_Buttons.qml" line="412"/>
         <source>Radio Button_3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1095,11 +1062,6 @@ Updated content:
         <source>Please enter a verification code</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="qml/page/T_Captcha.qml" line="48"/>
-        <source>verify</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="qml/page/T_Captcha.qml" line="52"/>
         <source>The verification code is correct</source>
@@ -1123,11 +1085,6 @@ Updated content:
         <source>Carousel map, support infinite carousel, infinite swipe, and components implemented with ListView</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="qml/page/T_Carousel.qml" line="203"/>
-        <source>Auto play</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>T_CheckBox</name>
@@ -1201,62 +1158,6 @@ Updated content:
         <source>ComboBox</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="qml/page/T_ComboBox.qml" line="20"/>
-        <source>editable=false</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_ComboBox.qml" line="26"/>
-        <location filename="qml/page/T_ComboBox.qml" line="50"/>
-        <location filename="qml/page/T_ComboBox.qml" line="74"/>
-        <location filename="qml/page/T_ComboBox.qml" line="100"/>
-        <source>Banana</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_ComboBox.qml" line="27"/>
-        <location filename="qml/page/T_ComboBox.qml" line="51"/>
-        <location filename="qml/page/T_ComboBox.qml" line="75"/>
-        <location filename="qml/page/T_ComboBox.qml" line="101"/>
-        <source>Apple</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_ComboBox.qml" line="28"/>
-        <location filename="qml/page/T_ComboBox.qml" line="52"/>
-        <location filename="qml/page/T_ComboBox.qml" line="76"/>
-        <location filename="qml/page/T_ComboBox.qml" line="102"/>
-        <source>Coconut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_ComboBox.qml" line="43"/>
-        <source>disabled=true</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_ComboBox.qml" line="67"/>
-        <source>editable=true</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_ComboBox.qml" line="88"/>
-        <source>FluComboBox{
-    editable: true
-    model: ListModel {
-        id: model
-        ListElement { text: &quot;%1&quot; }
-        ListElement { text: &quot;%2&quot; }
-        ListElement { text: &quot;%3&quot; }
-    }
-    onAccepted: {
-        if (find(editText) === -1)
-            model.append({text: editText})
-    }
-}</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>T_CustomPlot</name>
@@ -1413,26 +1314,6 @@ Since that moment, I have been tormented day and night by the fear that I might
 My only desire is to be permitted to drive out the traitors and restore the Han. If I should let you down, punish my offense and report it to the spirit of the late Emperor. If those three advisors should fail in their duties, then they should be punished for their negligence.Your Majesty, consider your course of action carefully. Seek out good advice, and never forget the late Emperor. I depart now on a long expedition, and I will be forever grateful if you heed my advice. Blinded by my own tears, I know not what I write.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="qml/page/T_Expander.qml" line="152"/>
-        <source>Check for Updates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Expander.qml" line="207"/>
-        <source>This is a ToggleButton in the header</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Expander.qml" line="215"/>
-        <source>This is a StandardButton in the content</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Expander.qml" line="217"/>
-        <source>Click StandardButton</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>T_FlipView</name>
@@ -1540,12 +1421,7 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_Icons.qml" line="28"/>
+        <location filename="qml/page/T_Icons.qml" line="51"/>
-        <source>Disabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Icons.qml" line="61"/>
         <source>You Copied </source>
         <translation type="unfinished"></translation>
     </message>
@@ -1591,21 +1467,11 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
         <source>This is an InfoBar in the Warning Style</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="qml/page/T_InfoBar.qml" line="39"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="qml/page/T_InfoBar.qml" line="41"/>
         <source>This is an InfoBar in the Error Style</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="qml/page/T_InfoBar.qml" line="45"/>
-        <source>Success</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="qml/page/T_InfoBar.qml" line="47"/>
         <source>This is an InfoBar in the Success Style</source>
@@ -1628,53 +1494,30 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
     </message>
     <message>
         <location filename="qml/page/T_InfoBar.qml" line="64"/>
-        <location filename="qml/page/T_InfoBar.qml" line="75"/>
+        <location filename="qml/page/T_InfoBar.qml" line="74"/>
-        <location filename="qml/page/T_InfoBar.qml" line="85"/>
+        <location filename="qml/page/T_InfoBar.qml" line="84"/>
         <source>close &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="qml/page/T_InfoBar.qml" line="64"/>
-        <location filename="qml/page/T_InfoBar.qml" line="75"/>
+        <location filename="qml/page/T_InfoBar.qml" line="74"/>
-        <location filename="qml/page/T_InfoBar.qml" line="85"/>
+        <location filename="qml/page/T_InfoBar.qml" line="84"/>
-        <source>show &apos;%1&apos;</source>
+        <source>show &apos;%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="qml/page/T_InfoBar.qml" line="70"/>
-        <location filename="qml/page/T_InfoBar.qml" line="81"/>
+        <location filename="qml/page/T_InfoBar.qml" line="80"/>
-        <location filename="qml/page/T_InfoBar.qml" line="91"/>
+        <location filename="qml/page/T_InfoBar.qml" line="90"/>
         <source>This is an &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_InfoBar.qml" line="64"/>
+        <location filename="qml/page/T_InfoBar.qml" line="94"/>
-        <location filename="qml/page/T_InfoBar.qml" line="70"/>
-        <source>info1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_InfoBar.qml" line="75"/>
-        <location filename="qml/page/T_InfoBar.qml" line="81"/>
-        <source>info2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_InfoBar.qml" line="85"/>
-        <location filename="qml/page/T_InfoBar.qml" line="91"/>
-        <source>info3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_InfoBar.qml" line="95"/>
         <source>clear all info</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="qml/page/T_InfoBar.qml" line="103"/>
-        <source>Loading</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>T_LineChart</name>
@@ -1949,31 +1792,6 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
         <source>QRCode</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="qml/page/T_QRCode.qml" line="27"/>
-        <source>text:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_QRCode.qml" line="41"/>
-        <source>color:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_QRCode.qml" line="54"/>
-        <source>bgColor:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_QRCode.qml" line="66"/>
-        <source>margins:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_QRCode.qml" line="80"/>
-        <source>size:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>T_RadarChart</name>
@@ -2215,37 +2033,6 @@ Some contents...</source>
         <source>SplitLayout</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="qml/page/T_SplitLayout.qml" line="18"/>
-        <source>orientation:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_SplitLayout.qml" line="23"/>
-        <location filename="qml/page/T_SplitLayout.qml" line="25"/>
-        <source>Horizontal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_SplitLayout.qml" line="32"/>
-        <source>Vertical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_SplitLayout.qml" line="57"/>
-        <source>Page 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_SplitLayout.qml" line="69"/>
-        <source>Page 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_SplitLayout.qml" line="78"/>
-        <source>Page 3</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>T_StaggeredLayout</name>
@@ -2262,27 +2049,6 @@ Some contents...</source>
         <source>StatusLayout</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="qml/page/T_StatusLayout.qml" line="22"/>
-        <location filename="qml/page/T_StatusLayout.qml" line="24"/>
-        <source>Loading</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_StatusLayout.qml" line="31"/>
-        <source>Empty</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_StatusLayout.qml" line="38"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_StatusLayout.qml" line="45"/>
-        <source>Success</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>T_TabView</name>
@@ -2296,48 +2062,6 @@ Some contents...</source>
         <source>Document </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="qml/page/T_TabView.qml" line="39"/>
-        <source>Tab Width Behavior:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_TabView.qml" line="44"/>
-        <location filename="qml/page/T_TabView.qml" line="46"/>
-        <source>Equal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_TabView.qml" line="53"/>
-        <source>SizeToContent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_TabView.qml" line="60"/>
-        <source>Compact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_TabView.qml" line="68"/>
-        <source>Tab Close Button Visibility:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_TabView.qml" line="72"/>
-        <location filename="qml/page/T_TabView.qml" line="82"/>
-        <source>Always</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_TabView.qml" line="75"/>
-        <source>Never</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_TabView.qml" line="89"/>
-        <source>OnHover</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>T_TableView</name>
@@ -2368,7 +2092,7 @@ Some contents...</source>
     </message>
     <message>
         <location filename="qml/page/T_TableView.qml" line="176"/>
-        <location filename="qml/page/T_TableView.qml" line="503"/>
+        <location filename="qml/page/T_TableView.qml" line="508"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2388,67 +2112,67 @@ Some contents...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="359"/>
+        <location filename="qml/page/T_TableView.qml" line="364"/>
         <source>Age</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="434"/>
+        <location filename="qml/page/T_TableView.qml" line="439"/>
         <source>Clear All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="441"/>
+        <location filename="qml/page/T_TableView.qml" line="446"/>
         <source>Delete Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="464"/>
+        <location filename="qml/page/T_TableView.qml" line="469"/>
         <source>Add a row of Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="470"/>
+        <location filename="qml/page/T_TableView.qml" line="475"/>
         <source>Insert a Row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="477"/>
+        <location filename="qml/page/T_TableView.qml" line="482"/>
         <source>Focus not acquired: Please click any item in the form as the target for insertion!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="508"/>
+        <location filename="qml/page/T_TableView.qml" line="513"/>
         <source>Avatar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="522"/>
+        <location filename="qml/page/T_TableView.qml" line="527"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="530"/>
+        <location filename="qml/page/T_TableView.qml" line="535"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="537"/>
+        <location filename="qml/page/T_TableView.qml" line="542"/>
         <source>Long String</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="545"/>
+        <location filename="qml/page/T_TableView.qml" line="550"/>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="563"/>
+        <location filename="qml/page/T_TableView.qml" line="568"/>
         <source>&lt;Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="564"/>
+        <location filename="qml/page/T_TableView.qml" line="569"/>
         <source>Next&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2461,15 +2185,10 @@ Some contents...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_Text.qml" line="19"/>
+        <location filename="qml/page/T_Text.qml" line="18"/>
         <source>This is a text that can be copied</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="qml/page/T_Text.qml" line="29"/>
-        <source>Disabled</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>T_TextBox</name>
@@ -2543,35 +2262,8 @@ Some contents...</source>
     <message>
         <location filename="qml/page/T_Theme.qml" line="123"/>
         <source>Open Blur Window</source>
-        <oldsource>Rounded Window</oldsource>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="qml/page/T_Theme.qml" line="157"/>
-        <location filename="qml/page/T_Theme.qml" line="162"/>
-        <source>dwm-blur</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Theme.qml" line="158"/>
-        <source>window tintOpacity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Theme.qml" line="175"/>
-        <source>window blurRadius</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Theme.qml" line="135"/>
-        <source>window effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Theme.qml" line="178"/>
-        <source></source>
-        <translation></translation>
-    </message>
 </context>
 <context>
     <name>T_TimePicker</name>
@@ -2644,27 +2336,6 @@ Some contents...</source>
         <source>clear</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="qml/page/T_Timeline.qml" line="130"/>
-        <source>mode:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Timeline.qml" line="137"/>
-        <source>Left</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Timeline.qml" line="144"/>
-        <source>Right</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Timeline.qml" line="135"/>
-        <location filename="qml/page/T_Timeline.qml" line="151"/>
-        <source>Alternate</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>T_ToggleSwitch</name>
@@ -2792,57 +2463,22 @@ Some contents...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TreeView.qml" line="92"/>
+        <location filename="qml/page/T_TreeView.qml" line="183"/>
-        <source>cellHeight:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_TreeView.qml" line="105"/>
-        <source>depthPadding:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_TreeView.qml" line="121"/>
-        <source>showLine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_TreeView.qml" line="126"/>
-        <source>checkable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_TreeView.qml" line="134"/>
-        <source>all expand</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_TreeView.qml" line="140"/>
-        <source>all collapse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_TreeView.qml" line="147"/>
-        <source>print selection model</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_TreeView.qml" line="182"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TreeView.qml" line="186"/>
+        <location filename="qml/page/T_TreeView.qml" line="187"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TreeView.qml" line="190"/>
+        <location filename="qml/page/T_TreeView.qml" line="191"/>
         <source>Avatar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TreeView.qml" line="194"/>
+        <location filename="qml/page/T_TreeView.qml" line="195"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2854,41 +2490,6 @@ Some contents...</source>
         <source>Typography</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="qml/page/T_Typography.qml" line="27"/>
-        <source>Display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Typography.qml" line="33"/>
-        <source>Title Large</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Typography.qml" line="39"/>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Typography.qml" line="45"/>
-        <source>Subtitle</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Typography.qml" line="51"/>
-        <source>Body Strong</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Typography.qml" line="57"/>
-        <source>Body</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Typography.qml" line="63"/>
-        <source>Caption</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>T_Watermark</name>
@@ -2897,45 +2498,5 @@ Some contents...</source>
         <source>Watermark</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="qml/page/T_Watermark.qml" line="25"/>
-        <source>text:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Watermark.qml" line="38"/>
-        <source>textSize:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Watermark.qml" line="51"/>
-        <source>gapX:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Watermark.qml" line="62"/>
-        <source>gapY:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Watermark.qml" line="73"/>
-        <source>offsetX:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Watermark.qml" line="84"/>
-        <source>offsetY:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Watermark.qml" line="95"/>
-        <source>rotate:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Watermark.qml" line="108"/>
-        <source>textColor:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 </TS>

example/qml/page/T_Acrylic.qml

@@ -12,7 +12,7 @@ FluScrollablePage{
     RowLayout{
         spacing: 10
         FluText{
-            text: qsTr("tintColor:")
+            text:"tintColor:"
             Layout.alignment: Qt.AlignVCenter
         }
         FluColorPicker{
@@ -22,7 +22,7 @@ FluScrollablePage{
     RowLayout{
         spacing: 10
         FluText{
-            text: qsTr("tintOpacity:")
+            text:"tintOpacity:"
             Layout.alignment: Qt.AlignVCenter
         }
         FluSlider{
@@ -33,7 +33,7 @@ FluScrollablePage{
     RowLayout{
         spacing: 10
         FluText{
-            text: qsTr("blurRadius:")
+            text:"blurRadius:"
             Layout.alignment: Qt.AlignVCenter
         }
         FluSlider{
@@ -69,7 +69,7 @@ FluScrollablePage{
                 y:(image.height-height)/2
                 FluText {
                     anchors.centerIn: parent
-                    text: qsTr("Acrylic")
+                    text: "Acrylic"
                     color: "#FFFFFF"
                     font: FluTextStyle.Subtitle
                 }

example/qml/page/T_BreadcrumbBar.qml

@@ -12,7 +12,7 @@ FluScrollablePage{
     Component.onCompleted: {
         var items = []
         for(var i=0;i<10;i++){
-            items.push({title: qsTr("Item_%1").arg(i+1)})
+            items.push({title:"Item_"+(i+1)})
         }
         breadcrumb_1.items = items
         breadcrumb_2.items = items
@@ -51,7 +51,7 @@ FluScrollablePage{
                 onClicked:{
                     var items = []
                     for(var i=0;i<10;i++){
-                        items.push({title: qsTr("Item_")+(i+1)})
+                        items.push({title:"Item_"+(i+1)})
                     }
                      breadcrumb_2.items = items
                 }

example/qml/page/T_Buttons.qml

@@ -219,7 +219,7 @@ FluScrollablePage{
         FluLoadingButton{
             id: btn_loading
             loading: loading_button_switch.checked
-            text: loading_button_switch.checked ? qsTr("Loading") : qsTr("Loading Button")
+            text: qsTr("Loading Button")
             anchors{
                 verticalCenter: parent.verticalCenter
                 left: parent.left
@@ -235,7 +235,7 @@ FluScrollablePage{
                 right: parent.right
                 verticalCenter: parent.verticalCenter
             }
-            text: loading_button_switch.checked ? qsTr("Loading") : qsTr("Normal")
+            text: qsTr("Loading")
         }
     }
     CodeExpander{
@@ -399,14 +399,16 @@ FluScrollablePage{
                 verticalCenter: parent.verticalCenter
                 left: parent.left
             }
-            disabled: radio_button_switch.checked
             FluRadioButton{
+                disabled:radio_button_switch.checked
                 text: qsTr("Radio Button_1")
             }
             FluRadioButton{
+                disabled:radio_button_switch.checked
                 text: qsTr("Radio Button_2")
             }
             FluRadioButton{
+                disabled:radio_button_switch.checked
                 text: qsTr("Radio Button_3")
             }
         }

example/qml/page/T_Captcha.qml

@@ -45,7 +45,7 @@ FluScrollablePage{
             Layout.preferredWidth: 240
         }
         FluButton{
-            text: qsTr("verify")
+            text:"verify"
             onClicked: {
                 var success =  captcha.verify(text_box.text)
                 if(success){

example/qml/page/T_Carousel.qml

@@ -121,89 +121,7 @@ FluScrollablePage{
 
         }
     }
-    CodeExpander{
-        Layout.fillWidth: true
-        Layout.topMargin: -6
-        code:'FluCarousel{
-    id:carousel
-    width: 400
-    height: 300
-    delegate: Component{
-        Image {
-            anchors.fill: parent
-            source: model.url
-            asynchronous: true
-            fillMode:Image.PreserveAspectCrop
-        }
-    }
-    Component.onCompleted: {
-        carousel.model = [{url:"qrc:/example/res/image/banner_1.jpg"},{url:"qrc:/example/res/image/banner_2.jpg"},{url:"qrc:/example/res/image/banner_3.jpg"}]
-    }
-}'
-    }
 
-    FluFrame{
-        Layout.fillWidth: true
-        Layout.preferredHeight: 300 + topPadding + bottomPadding
-        padding: 10
-        Layout.topMargin: 10
-        RowLayout{
-            anchors.fill: parent
-            Item{
-                Layout.preferredWidth: 400
-                Layout.fillHeight: true
-                FluShadow{
-                    radius: 8
-                }
-                FluCarousel{
-                    anchors.fill: parent
-                    orientation: Qt.Vertical
-                    autoPlay: auto_play_switch.checked
-                    loopTime:1500
-                    indicatorGravity: Qt.AlignVCenter | Qt.AlignRight
-                    indicatorMarginTop:15
-                    delegate: Component{
-                        Item{
-                            anchors.fill: parent
-                            Image {
-                                anchors.fill: parent
-                                source: model.url
-                                asynchronous: true
-                                fillMode:Image.PreserveAspectCrop
-                            }
-                            Rectangle{
-                                height: 40
-                                width: parent.width
-                                anchors.bottom: parent.bottom
-                                color: "#33000000"
-                                FluText{
-                                    anchors.fill: parent
-                                    verticalAlignment: Qt.AlignVCenter
-                                    horizontalAlignment: Qt.AlignHCenter
-                                    text:model.title
-                                    color: FluColors.Grey10
-                                }
-                            }
-                        }
-                    }
-                    Layout.topMargin: 20
-                    Layout.leftMargin: 5
-                    Component.onCompleted: {
-                        var arr = []
-                        arr.push({url:"qrc:/example/res/image/banner_1.jpg",title:"共同应对全球性问题"})
-                        arr.push({url:"qrc:/example/res/image/banner_2.jpg",title:"三小只全程没互动"})
-                        arr.push({url:"qrc:/example/res/image/banner_3.jpg",title:"有效投资扩大 激发增长动能"})
-                        model = arr
-                    }
-                }
-            }
-            FluToggleSwitch{
-                id: auto_play_switch
-                Layout.alignment: Qt.AlignRight
-                text: qsTr("Auto play")
-            }
-        }
-    }
     CodeExpander{
         Layout.fillWidth: true
         Layout.topMargin: -6
@@ -211,7 +129,6 @@ FluScrollablePage{
     id:carousel
     width: 400
     height: 300
-    orientation: Qt.Vertical
     delegate: Component{
         Image {
             anchors.fill: parent

example/qml/page/T_ComboBox.qml

@@ -17,15 +17,15 @@ FluScrollablePage{
             spacing: 5
             anchors.verticalCenter: parent.verticalCenter
             FluText{
-                text: qsTr("editable=false")
+                text: "editable=false"
                 x:10
             }
             FluComboBox {
                 model: ListModel {
                     id: model_1
-                    ListElement { text: qsTr("Banana") }
+                    ListElement { text: "Banana" }
-                    ListElement { text: qsTr("Apple") }
+                    ListElement { text: "Apple" }
-                    ListElement { text: qsTr("Coconut") }
+                    ListElement { text: "Coconut" }
                 }
             }
         }
@@ -40,16 +40,16 @@ FluScrollablePage{
             spacing: 5
             anchors.verticalCenter: parent.verticalCenter
             FluText{
-                text: qsTr("disabled=true")
+                text: "disabled=true"
                 x:10
             }
             FluComboBox {
                 disabled: true
                 model: ListModel {
                     id: model_2
-                    ListElement { text: qsTr("Banana") }
+                    ListElement { text: "Banana" }
-                    ListElement { text: qsTr("Apple") }
+                    ListElement { text: "Apple" }
-                    ListElement { text: qsTr("Coconut") }
+                    ListElement { text: "Coconut" }
                 }
             }
         }
@@ -64,16 +64,16 @@ FluScrollablePage{
             spacing: 5
             anchors.verticalCenter: parent.verticalCenter
             FluText{
-                text: qsTr("editable=true")
+                text: "editable=true"
                 x:5
             }
             FluComboBox {
                 editable: true
                 model: ListModel {
                     id: model_3
-                    ListElement { text: qsTr("Banana") }
+                    ListElement { text: "Banana" }
-                    ListElement { text: qsTr("Apple") }
+                    ListElement { text: "Apple" }
-                    ListElement { text: qsTr("Coconut") }
+                    ListElement { text: "Coconut" }
                 }
                 onAccepted: {
                     if (find(editText) === -1)
@@ -85,21 +85,19 @@ FluScrollablePage{
     CodeExpander{
         Layout.fillWidth: true
         Layout.topMargin: -6
-        code:qsTr('FluComboBox{
+        code:'FluComboBox{
     editable: true
     model: ListModel {
         id: model
-        ListElement { text: "%1" }
+        ListElement { text: "Banana" }
-        ListElement { text: "%2" }
+        ListElement { text: "Apple" }
-        ListElement { text: "%3" }
+        ListElement { text: "Coconut" }
     }
     onAccepted: {
         if (find(editText) === -1)
             model.append({text: editText})
     }
-}').arg(qsTr("Banana"))
+}'
-   .arg(qsTr("Apple"))
-   .arg(qsTr("Coconut"))
     }
 
 }

example/qml/page/T_Expander.qml

@@ -105,147 +105,5 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
 }'
     }
 
-    FluFrame {
-        Layout.fillWidth: true
-        padding: 10
-        Layout.topMargin: 20
-        Column {
-            spacing: 15
-            FluExpander {
-                headerHeight: 60
-                contentHeight: content_layout.implicitHeight
-                headerDelegate: Component {
-                    Item {
-                        RowLayout {
-                            anchors {
-                                verticalCenter: parent.verticalCenter
-                                left: parent.left
-                                leftMargin: 15
-                            }
-                            spacing: 15
-                            FluImage {
-                                width: 20
-                                height: 20
-                                sourceSize.width: 20
-                                sourceSize.height: 20
-                                source: "qrc:/example/res/image/favicon.ico"
-                            }
-                            ColumnLayout {
-                                spacing: 0
-                                FluText {
-                                    text: "FluentUI"
-                                }
-                                FluText {
-                                    text: "%1".arg(AppInfo.version)
-                                    textColor: FluTheme.fontSecondaryColor
-                                    font.pixelSize: 12
-                                }
-                            }
-                        }
-                        FluLoadingButton {
-                            id: btn_checkupdate
-                            anchors {
-                                verticalCenter: parent.verticalCenter
-                                right: parent.right
-                                rightMargin: 15
-                            }
-                            text: qsTr("Check for Updates")
-                            onClicked: {
-                                loading = true;
-                                FluEventBus.post("checkUpdate");
-                            }
-                        }
-                        FluEvent {
-                            name: "checkUpdateFinish"
-                            onTriggered: {
-                                btn_checkupdate.loading = false;
-                            }
-                        }
-                    }
-                }
-                content: ColumnLayout {
-                    id: content_layout
-                    spacing: 0
-                    RowLayout {
-                        Layout.topMargin: 15
-                        Layout.leftMargin: 15
-                        spacing: 0
-                        FluText {
-                            text: "GitHub: "
-                        }
-                        FluTextButton {
-                            text: "https://github.com/zhuzichu520/FluentUI"
-                            onClicked: {
-                                Qt.openUrlExternally(text);
-                            }
-                        }
-                    }
-                    RowLayout {
-                        Layout.bottomMargin: 15
-                        Layout.leftMargin: 15
-                        spacing: 0
-                        FluText {
-                            text: "bilibili: "
-                        }
-                        FluTextButton {
-                            text: "https://www.bilibili.com/video/BV1mg4y1M71w"
-                            onClicked: {
-                                Qt.openUrlExternally(text);
-                            }
-                        }
-                    }
-                }
-            }
 
-            FluExpander {
-                contentHeight: 100
-                headerHeight: 45
-                headerDelegate: Component {
-                    Item {
-                        FluToggleButton {
-                            anchors.centerIn: parent
-                            text: qsTr("This is a ToggleButton in the header")
-                        }
-                    }
-                }
-                content: Item {
-                    anchors.fill: parent
-                    FluButton {
-                        anchors.centerIn: parent
-                        text: qsTr("This is a StandardButton in the content")
-                        onClicked: {
-                            showInfo(qsTr("Click StandardButton"))
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    CodeExpander {
-        Layout.fillWidth: true
-        Layout.topMargin: -6
-        code: 'FluExpander {
-    contentHeight: 100
-    headerHeight: 45
-    headerDelegate: Component {
-        Item {
-            FluToggleButton {
-                anchors.centerIn: parent
-                text: qsTr("This is a ToggleButton in the header")
-            }
-        }
-    }
-    content: Item {
-        anchors.fill: parent
-        FluButton {
-            anchors.centerIn: parent
-            text: qsTr("This is a StandardButton in the content")
-            onClicked: {
-                showInfo(qsTr("Click StandardButton"))
-            }
-        }
-    }
-}'
-    }
 }

example/qml/page/T_Icons.qml

@@ -18,15 +18,6 @@ FluContentPage {
             grid_view.model = FluApp.iconData(text_box.text)
         }
     }
-    FluToggleSwitch{
-        id: toggle_switch
-        anchors{
-            left: text_box.right
-            verticalCenter: text_box.verticalCenter
-            leftMargin: 10
-        }
-        text: qsTr("Disabled")
-    }
     GridView{
         id: grid_view
         cellWidth: 110
@@ -54,7 +45,6 @@ FluContentPage {
                 horizontalPadding: 0
                 bottomPadding: 30
                 anchors.fill: parent
-                disabled: toggle_switch.checked
                 onClicked: {
                     var text  ="FluentIcons."+modelData.name;
                     FluTools.clipText(text)
@@ -67,7 +57,6 @@ FluContentPage {
                     text: modelData.name
                     anchors.top: parent.top
                     anchors.topMargin: 60
-                    enabled: !toggle_switch.checked
                 }
             }
         }

example/qml/page/T_InfoBar.qml

@@ -36,13 +36,13 @@ FluScrollablePage{
                 }
             }
             FluButton{
-                text: qsTr("Error")
+                text:"Error"
                 onClicked: {
                     showError(qsTr("This is an InfoBar in the Error Style"))
                 }
             }
             FluButton{
-                text: qsTr("Success")
+                text:"Success"
                 onClicked: {
                     showSuccess(qsTr("This is an InfoBar in the Success Style"))
                 }
@@ -61,34 +61,33 @@ FluScrollablePage{
             Row{
                 spacing: 5
                 FluButton{
-                    text: (info1 ? qsTr("close '%1'") : qsTr("show '%1'")).arg(qsTr("info1"))
+                    text: (info1 ? qsTr("close '%1'") : qsTr("show '%1")).arg("info1")
                     onClicked: {
                         if(info1) {
                             info1.close()
                             return
                         }
-                        info1 = showInfo(qsTr("This is an '%1'").arg(qsTr("info1")), 0)
+                        info1 = showInfo(qsTr("This is an '%1'").arg("info1"), 0)
-                        info1.close()
                     }
                 }
                 FluButton{
-                    text: (info2 ? qsTr("close '%1'") : qsTr("show '%1'")).arg(qsTr("info2"))
+                    text: (info2 ? qsTr("close '%1'") : qsTr("show '%1")).arg("info2")
                     onClicked: {
                         if(info2) {
                             info2.close()
                             return
                         }
-                        info2 = showInfo(qsTr("This is an '%1'").arg(qsTr("info2")), 0)
+                        info2 = showInfo(qsTr("This is an '%1'").arg("info2"), 0)
                     }
                 }
                 FluButton{
-                    text: (info3 ? qsTr("close '%1'") : qsTr("show '%1'")).arg(qsTr("info3"))
+                    text: (info3 ? qsTr("close '%1'") : qsTr("show '%1")).arg("info3")
                     onClicked: {
                         if(info3) {
                             info3.close()
                             return
                         }
-                        info3 = showInfo(qsTr("This is an '%1'").arg(qsTr("info3")), 0)
+                        info3 = showInfo(qsTr("This is an '%1'").arg("info3"), 0)
                     }
                 }
                 FluButton{
@@ -100,7 +99,7 @@ FluScrollablePage{
             }
 
             FluButton{
-                text: qsTr("Loading")
+                text:"Loading"
                 onClicked: {
                     showLoading()
                 }

example/qml/page/T_Pivot.qml

@@ -49,26 +49,26 @@ FluScrollablePage{
         Layout.topMargin: -6
         code:'FluPivot{
     anchors.fill: parent
-    FluPivotItem {
+    FluPivotItem:{
-        title: qsTr("All")
+        text: qsTr("All")
         contentItem: FluText{
             text: qsTr("All emails go here.")
         }
     }
-    FluPivotItem {
+    FluPivotItem:{
-        title: qsTr("Unread")
+        text: qsTr("Unread")
         contentItem: FluText{
             text: qsTr("Unread emails go here.")
         }
     }
-    FluPivotItem {
+    FluPivotItem:{
-        title: qsTr("Flagged")
+        text: qsTr("Flagged")
         contentItem: FluText{
             text: qsTr("Flagged emails go here.")
         }
     }
-    FluPivotItem {
+    FluPivotItem:{
-        title: qsTr("Urgent")
+        text: qsTr("Urgent")
         contentItem: FluText{
             text: qsTr("Urgent emails go here.")
         }

example/qml/page/T_QRCode.qml

@@ -24,7 +24,7 @@ FluScrollablePage{
         spacing: 10
         Layout.topMargin: 20
         FluText{
-            text: qsTr("text:")
+            text:"text:"
             Layout.alignment: Qt.AlignVCenter
         }
         FluTextBox{
@@ -38,7 +38,7 @@ FluScrollablePage{
         spacing: 10
         Layout.topMargin: 10
         FluText{
-            text: qsTr("color:")
+            text:"color:"
             Layout.alignment: Qt.AlignVCenter
         }
         FluColorPicker{
@@ -51,7 +51,7 @@ FluScrollablePage{
         spacing: 10
         Layout.topMargin: 10
         FluText{
-            text: qsTr("bgColor:")
+            text:"bgColor:"
             Layout.alignment: Qt.AlignVCenter
         }
         FluColorPicker{
@@ -63,7 +63,7 @@ FluScrollablePage{
     RowLayout{
         spacing: 10
         FluText{
-            text: qsTr("margins:")
+            text:"margins:"
             Layout.alignment: Qt.AlignVCenter
         }
         FluSlider{
@@ -77,7 +77,7 @@ FluScrollablePage{
     RowLayout{
         spacing: 10
         FluText{
-            text: qsTr("size:")
+            text:"size:"
             Layout.alignment: Qt.AlignVCenter
         }
         FluSlider{

example/qml/page/T_SplitLayout.qml

@@ -15,21 +15,21 @@ FluContentPage{
             top: parent.top
         }
         FluText{
-            text: qsTr("orientation:")
+            text:"orientation:"
         }
         FluDropDownButton{
             id:btn_orientation
             Layout.preferredWidth: 120
-            text: qsTr("Horizontal")
+            text:"Horizontal"
             FluMenuItem{
-                text: qsTr("Horizontal")
+                text:"Horizontal"
                 onClicked: {
                     btn_orientation.text = text
                     split_layout.orientation = Qt.Horizontal
                 }
             }
             FluMenuItem{
-                text: qsTr("Vertical")
+                text:"Vertical"
                 onClicked: {
                     btn_orientation.text = text
                     split_layout.orientation = Qt.Vertical
@@ -54,7 +54,7 @@ FluContentPage{
             SplitView.maximumWidth: 400
             SplitView.maximumHeight: 400
             FluText {
-                text: qsTr("Page 1")
+                text: "Page 1"
                 anchors.centerIn: parent
             }
         }
@@ -66,7 +66,7 @@ FluContentPage{
             SplitView.fillWidth: true
             SplitView.fillHeight: true
             FluText {
-                text: qsTr("Page 2")
+                text: "Page 2"
                 anchors.centerIn: parent
             }
         }
@@ -75,7 +75,7 @@ FluContentPage{
             implicitWidth: 200
             implicitHeight: 200
             FluText {
-                text: qsTr("Page 3")
+                text: "Page 3"
                 anchors.centerIn: parent
             }
         }

example/qml/page/T_StatusLayout.qml

@@ -19,30 +19,30 @@ FluScrollablePage{
             FluDropDownButton{
                 id:btn_status_mode
                 Layout.preferredWidth: 140
-                text: qsTr("Loading")
+                text:"Loading"
                 FluMenuItem{
-                    text: qsTr("Loading")
+                    text:"Loading"
                     onClicked: {
                         btn_status_mode.text = text
                         status_view.statusMode = FluStatusLayoutType.Loading
                     }
                 }
                 FluMenuItem{
-                    text: qsTr("Empty")
+                    text:"Empty"
                     onClicked: {
                         btn_status_mode.text = text
                         status_view.statusMode = FluStatusLayoutType.Empty
                     }
                 }
                 FluMenuItem{
-                    text: qsTr("Error")
+                    text:"Error"
                     onClicked: {
                         btn_status_mode.text = text
                         status_view.statusMode = FluStatusLayoutType.Error
                     }
                 }
                 FluMenuItem{
-                    text: qsTr("Success")
+                    text:"Success"
                     onClicked: {
                         btn_status_mode.text = text
                         status_view.statusMode = FluStatusLayoutType.Success

example/qml/page/T_TabView.qml

@@ -35,58 +35,52 @@ FluScrollablePage{
         padding: 10
         RowLayout{
             spacing: 14
-            FluCopyableText{
-                text: qsTr("Tab Width Behavior:")
-            }
             FluDropDownButton{
                 id:btn_tab_width_behavior
                 Layout.preferredWidth: 140
-                text:  qsTr("Equal")
+                text:"Equal"
                 FluMenuItem{
-                    text: qsTr("Equal")
+                    text:"Equal"
                     onClicked: {
                         btn_tab_width_behavior.text = text
                         tab_view.tabWidthBehavior = FluTabViewType.Equal
                     }
                 }
                 FluMenuItem{
-                    text: qsTr("SizeToContent")
+                    text:"SizeToContent"
                     onClicked: {
                         btn_tab_width_behavior.text = text
                         tab_view.tabWidthBehavior = FluTabViewType.SizeToContent
                     }
                 }
                 FluMenuItem{
-                    text: qsTr("Compact")
+                    text:"Compact"
                     onClicked: {
                         btn_tab_width_behavior.text = text
                         tab_view.tabWidthBehavior = FluTabViewType.Compact
                     }
                 }
             }
-            FluCopyableText{
-                text: qsTr("Tab Close Button Visibility:")
-            }
             FluDropDownButton{
                 id:btn_close_button_visibility
-                text: qsTr("Always")
+                text:"Always"
                 Layout.preferredWidth: 120
                 FluMenuItem{
-                    text: qsTr("Never")
+                    text:"Never"
                     onClicked: {
                         btn_close_button_visibility.text = text
                         tab_view.closeButtonVisibility = FluTabViewType.Never
                     }
                 }
                 FluMenuItem{
-                    text: qsTr("Always")
+                    text:"Always"
                     onClicked: {
                         btn_close_button_visibility.text = text
                         tab_view.closeButtonVisibility = FluTabViewType.Always
                     }
                 }
                 FluMenuItem{
-                    text: qsTr("OnHover")
+                    text:"OnHover"
                     onClicked: {
                         btn_close_button_visibility.text = text
                         tab_view.closeButtonVisibility = FluTabViewType.OnHover

example/qml/page/T_TableView.qml

@@ -315,7 +315,12 @@ FluContentPage{
                 radius: [20,20,20,20]
                 Image{
                     anchors.fill: parent
-                    source: options && options.avatar ? options.avatar : ""
+                    source: {
+                        if(options && options.avatar){
+                            return options.avatar
+                        }
+                        return ""
+                    }
                     sourceSize: Qt.size(80,80)
                 }
             }

example/qml/page/T_Text.qml

@@ -15,19 +15,10 @@ FluScrollablePage{
         padding: 10
 
         FluCopyableText{
-            enabled: !toggle_switch.checked
             text: qsTr("This is a text that can be copied")
             anchors.verticalCenter: parent.verticalCenter
         }
 
-        FluToggleSwitch{
-            id: toggle_switch
-            anchors{
-                right: parent.right
-                verticalCenter: parent.verticalCenter
-            }
-            text: qsTr("Disabled")
-        }
     }
     CodeExpander{
         Layout.fillWidth: true

example/qml/page/T_Theme.qml

@@ -13,7 +13,7 @@ FluScrollablePage{
 
     FluFrame{
         Layout.fillWidth: true
-        Layout.fillHeight: true
+        Layout.preferredHeight: 408
         padding: 10
 
         ColumnLayout{
@@ -124,69 +124,12 @@ FluScrollablePage{
                 Layout.topMargin: 20
             }
             FluToggleSwitch{
-                id: toggle_blur
                 Layout.topMargin: 5
                 checked: FluTheme.blurBehindWindowEnabled
                 onClicked: {
                     FluTheme.blurBehindWindowEnabled = !FluTheme.blurBehindWindowEnabled
                 }
             }
-            FluText{
-                text: qsTr("window effect")
-                Layout.topMargin: 20
-            }
-            Row{
-                spacing: 10
-                Repeater{
-                    model: window.availableEffects
-                    delegate: FluRadioButton{
-                        checked: window.effect === modelData
-                        text: qsTr(`${modelData}`)
-                        clickListener:function(){
-                            window.effect = modelData
-                            if(window.effective){
-                                FluTheme.blurBehindWindowEnabled = false
-                                toggle_blur.checked = Qt.binding( function() {return FluTheme.blurBehindWindowEnabled})
-                            }
-                        }
-                    }
-
-                }
-            }
-            FluText{
-                visible: FluTheme.blurBehindWindowEnabled || window.effect === qsTr("dwm-blur")
-                text: qsTr("window tintOpacity")
-                Layout.topMargin: 20
-            }
-            FluSlider{
-                visible: FluTheme.blurBehindWindowEnabled || window.effect === qsTr("dwm-blur")
-                Layout.topMargin: 5
-                to:1
-                stepSize:0.1
-                onValueChanged: {
-                    window.tintOpacity = value
-                }
-                Component.onCompleted: {
-                    value = window.tintOpacity
-                }
-            }
-            FluText{
-                visible: FluTheme.blurBehindWindowEnabled
-                text: qsTr("window blurRadius")
-                Layout.topMargin: 20
-            }
-            FluSlider{
-                visible: FluTheme.blurBehindWindowEnabled
-                Layout.topMargin: 5
-                to:100
-                stepSize:1
-                onValueChanged: {
-                    window.blurRadius = value
-                }
-                Component.onCompleted: {
-                    value = window.blurRadius
-                }
-            }
         }
     }
     CodeExpander{

example/qml/page/T_Timeline.qml

@@ -127,28 +127,28 @@ FluScrollablePage{
     RowLayout{
         Layout.topMargin: 10
         FluText{
-            text: qsTr("mode:")
+            text:"mode:"
         }
         FluDropDownButton{
             id: btn_mode
             Layout.preferredWidth: 100
-            text:  qsTr("Alternate")
+            text: "Alternate"
             FluMenuItem{
-                text: qsTr("Left")
+                text: "Left"
                 onClicked: {
                     btn_mode.text = text
                     time_line.mode = FluTimelineType.Left
                 }
             }
             FluMenuItem{
-                text: qsTr("Right")
+                text: "Right"
                 onClicked: {
                     btn_mode.text = text
                     time_line.mode = FluTimelineType.Right
                 }
             }
             FluMenuItem{
-                text: qsTr("Alternate")
+                text: "Alternate"
                 onClicked: {
                     btn_mode.text = text
                     time_line.mode = FluTimelineType.Alternate

example/qml/page/T_TreeView.qml

@@ -9,6 +9,7 @@ FluContentPage {
 
     title: qsTr("TreeView")
 
+
     function treeData(){
         const names = ["孙悟空", "猪八戒", "沙和尚", "唐僧","白骨夫人","金角大王","熊山君","黄风怪","银角大王"]
         function getRandomName(){
@@ -89,7 +90,7 @@ FluContentPage {
                 RowLayout{
                     spacing: 10
                     FluText{
-                        text: qsTr("cellHeight:")
+                        text: "cellHeight:"
                         Layout.alignment: Qt.AlignVCenter
                     }
                     FluSlider{
@@ -102,7 +103,7 @@ FluContentPage {
                 RowLayout{
                     spacing: 10
                     FluText{
-                        text: qsTr("depthPadding:")
+                        text: "depthPadding:"
                         Layout.alignment: Qt.AlignVCenter
                     }
                     FluSlider{
@@ -118,12 +119,12 @@ FluContentPage {
                 anchors.verticalCenter: parent.verticalCenter
                 FluToggleSwitch{
                     id: switch_showline
-                    text: qsTr("showLine")
+                    text:"showLine"
                     checked: false
                 }
                 FluToggleSwitch{
                     id: switch_checkable
-                    text: qsTr("checkable")
+                    text:"checkable"
                     checked: false
                 }
             }
@@ -131,20 +132,20 @@ FluContentPage {
                 spacing: 8
                 anchors.verticalCenter: parent.verticalCenter
                 FluButton{
-                    text: qsTr("all expand")
+                    text: "all expand"
                     onClicked: {
                         tree_view.allExpand()
                     }
                 }
                 FluButton{
-                    text: qsTr("all collapse")
+                    text: "all collapse"
                     onClicked: {
                         tree_view.allCollapse()
                     }
                 }
             }
             FluButton{
-                text: qsTr("print selection model")
+                text: "print selection model"
                 onClicked: {
                     var printData = []
                     var data = tree_view.selectionModel();

example/qml/page/T_Typography.qml

@@ -24,43 +24,43 @@ FluContentPage {
             transformOrigin: Item.TopLeft
             FluText{
                 id:text_Display
-                text: qsTr("Display")
+                text:"Display"
                 padding: 0
                 font: FluTextStyle.Display
             }
             FluText{
                 id:text_TitleLarge
-                text: qsTr("Title Large")
+                text:"Title Large"
                 padding: 0
                 font: FluTextStyle.TitleLarge
             }
             FluText{
                 id:text_Title
-                text: qsTr("Title")
+                text:"Title"
                 padding: 0
                 font: FluTextStyle.Title
             }
             FluText{
                 id:text_Subtitle
-                text:  qsTr("Subtitle")
+                text:"Subtitle"
                 padding: 0
                 font: FluTextStyle.Subtitle
             }
             FluText{
                 id:text_BodyStrong
-                text: qsTr("Body Strong")
+                text:"Body Strong"
                 padding: 0
                 font: FluTextStyle.BodyStrong
             }
             FluText{
                 id:text_Body
-                text: qsTr("Body")
+                text:"Body"
                 padding: 0
                 font: FluTextStyle.Body
             }
             FluText{
                 id:text_Caption
-                text: qsTr("Caption")
+                text:"Caption"
                 padding: 0
                 font: FluTextStyle.Caption
             }

example/qml/page/T_Watermark.qml

@@ -22,7 +22,7 @@ FluContentPage{
                 spacing: 10
                 Layout.topMargin: 14
                 FluText{
-                    text: qsTr("text:")
+                    text: "text:"
                     Layout.alignment: Qt.AlignVCenter
                 }
                 FluTextBox{
@@ -35,7 +35,7 @@ FluContentPage{
             RowLayout{
                 spacing: 10
                 FluText{
-                    text: qsTr("textSize:")
+                    text: "textSize:"
                     Layout.alignment: Qt.AlignVCenter
                 }
                 FluSlider{
@@ -48,7 +48,7 @@ FluContentPage{
             RowLayout{
                 spacing: 10
                 FluText{
-                    text: qsTr("gapX:")
+                    text: "gapX:"
                     Layout.alignment: Qt.AlignVCenter
                 }
                 FluSlider{
@@ -59,7 +59,7 @@ FluContentPage{
             RowLayout{
                 spacing: 10
                 FluText{
-                    text: qsTr("gapY:")
+                    text: "gapY:"
                     Layout.alignment: Qt.AlignVCenter
                 }
                 FluSlider{
@@ -70,7 +70,7 @@ FluContentPage{
             RowLayout{
                 spacing: 10
                 FluText{
-                    text: qsTr("offsetX:")
+                    text: "offsetX:"
                     Layout.alignment: Qt.AlignVCenter
                 }
                 FluSlider{
@@ -81,7 +81,7 @@ FluContentPage{
             RowLayout{
                 spacing: 10
                 FluText{
-                    text: qsTr("offsetY:")
+                    text: "offsetY:"
                     Layout.alignment: Qt.AlignVCenter
                 }
                 FluSlider{
@@ -92,7 +92,7 @@ FluContentPage{
             RowLayout{
                 spacing: 10
                 FluText{
-                    text: qsTr("rotate:")
+                    text: "rotate:"
                     Layout.alignment: Qt.AlignVCenter
                 }
                 FluSlider{
@@ -105,7 +105,7 @@ FluContentPage{
             RowLayout{
                 spacing: 10
                 FluText{
-                    text: qsTr("textColor:")
+                    text: "textColor:"
                     Layout.alignment: Qt.AlignVCenter
                 }
                 FluColorPicker{

example/qml/window/MainWindow.qml

@@ -236,7 +236,6 @@ FluWindow {
             id: reveal
             target: window.containerItem()
             anchors.fill: parent
-            darkToLight: FluTheme.dark
             onAnimationFinished:{
                 //动画结束后释放资源
                 loader_reveal.sourceComponent = undefined
@@ -257,14 +256,17 @@ FluWindow {
     }
 
     function handleDarkChanged(button){
-        if(FluTools.isMacos() || !FluTheme.animationEnabled){
+        if(!FluTheme.animationEnabled || window.fitsAppBarWindows === false){
             changeDark()
         }else{
+            if(loader_reveal.sourceComponent){
+                return
+            }
             loader_reveal.sourceComponent = com_reveal
             var target = window.containerItem()
             var pos = button.mapToItem(target,0,0)
-            var mouseX = pos.x + button.width / 2
+            var mouseX = pos.x
-            var mouseY = pos.y + button.height / 2
+            var mouseY = pos.y
             var radius = Math.max(distance(mouseX,mouseY,0,0),distance(mouseX,mouseY,target.width,0),distance(mouseX,mouseY,0,target.height),distance(mouseX,mouseY,target.width,target.height))
             var reveal = loader_reveal.item
             reveal.start(reveal.width*Screen.devicePixelRatio,reveal.height*Screen.devicePixelRatio,Qt.point(mouseX,mouseY),radius)

example/res/template/src/CMakeLists.txt.in

@@ -72,6 +72,11 @@ install(TARGETS ${PROJECT_NAME}
     BUNDLE DESTINATION .
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
+if(QT_VERSION_MAJOR EQUAL 6)
+    qt_import_qml_plugins(${PROJECT_NAME})
+    qt_finalize_executable(${PROJECT_NAME})
+endif()
+
 if (CMAKE_BUILD_TYPE MATCHES "Release")
     if (APPLE)
         find_program(QT_DEPLOY_QT NAMES macdeployqt)

example/src/component/CircularReveal.cpp

@@ -25,32 +25,13 @@ void CircularReveal::paint(QPainter *painter) {
     path.moveTo(_center.x(), _center.y());
     path.addEllipse(QPointF(_center.x(), _center.y()), _radius, _radius);
     painter->setCompositionMode(QPainter::CompositionMode_Clear);
-    if(_darkToLight){
+    painter->fillPath(path, Qt::black);
-        painter->fillPath(path, Qt::white);
-    }else{
-        QPainterPath outerRect;
-        outerRect.addRect(0, 0, width(), height());
-        outerRect = outerRect.subtracted(path);
-        painter->fillPath(outerRect, Qt::black);
-    }
     painter->restore();
 }
 
 [[maybe_unused]] void CircularReveal::start(int w, int h, const QPoint &center, int radius) {
-    if (_anim->state() == QAbstractAnimation::Running) {
+    _anim->setStartValue(0);
-        _anim->stop();
+    _anim->setEndValue(radius);
-        int currentRadius = _radius;
-        _anim->setStartValue(currentRadius);
-        _anim->setEndValue(_darkToLight ? 0 : radius);
-    } else {
-        if(_darkToLight){
-            _anim->setStartValue(radius);
-            _anim->setEndValue(0);
-        }else{
-            _anim->setStartValue(0);
-            _anim->setEndValue(radius);
-        }
-    }
     _center = center;
     _grabResult = _target->grabToImage(QSize(w, h));
     connect(_grabResult.data(), &QQuickItemGrabResult::ready, this,

example/src/component/CircularReveal.h

@@ -10,7 +10,6 @@ class CircularReveal : public QQuickPaintedItem {
     Q_OBJECT
     Q_PROPERTY_AUTO_P(QQuickItem *, target)
     Q_PROPERTY_AUTO(int, radius)
-    Q_PROPERTY_AUTO(bool, darkToLight)
 public:
     explicit CircularReveal(QQuickItem *parent = nullptr);
     void paint(QPainter *painter) override;

example/src/main.cpp

@@ -90,7 +90,7 @@ int main(int argc, char *argv[]) {
     engine.rootContext()->setContextProperty("TranslateHelper", TranslateHelper::getInstance());
     engine.rootContext()->setContextProperty("Network", Network::getInstance());
 #ifdef FLUENTUI_BUILD_STATIC_LIB
-    FluentUI::registerTypes(&engine);
+    FluentUI::getInstance()->registerTypes(&engine);
 #endif
     const QUrl url(QStringLiteral("qrc:/example/qml/App.qml"));
     QObject::connect(

src/CMakeLists.txt

@@ -145,7 +145,7 @@ endif ()
 if (QT_VERSION VERSION_GREATER_EQUAL "6.2")
     #如果是Qt6.2版本以上，则使用qt_add_library，qt_add_qml_module函数添加资源文件
     if (FLUENTUI_BUILD_STATIC_LIB)
-        set(FLUENTUI_QML_PLUGIN_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/FluentUI)
+        set(FLUENTUI_QML_PLUGIN_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/FluentUI)
     endif ()
     qt_add_library(${PROJECT_NAME} ${LIB_TYPE})
     qt_add_qml_module(${PROJECT_NAME}
@@ -227,7 +227,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE
 if ((${QT_VERSION_MAJOR} LESS_EQUAL 6) AND (CMAKE_BUILD_TYPE MATCHES "Release"))
     find_program(QML_PLUGIN_DUMP NAMES qmlplugindump)
     add_custom_target(Script-Generate-QmlTypes
-            COMMAND ${QML_PLUGIN_DUMP} -nonrelocatable -noinstantiate FluentUI 1.0 ${CMAKE_CURRENT_BINARY_DIR} > ${CMAKE_CURRENT_SOURCE_DIR}/Qt5/imports/FluentUI/plugins.qmltypes
+            COMMAND ${QML_PLUGIN_DUMP} -nonrelocatable  FluentUI 1.0 ${CMAKE_CURRENT_BINARY_DIR} > ${CMAKE_CURRENT_SOURCE_DIR}/Qt5/imports/FluentUI/plugins.qmltypes
             COMMENT "Generate qmltypes........."
             SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Qt5/imports/FluentUI/plugins.qmltypes
             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

src/FluFrameless.cpp

@@ -4,156 +4,32 @@
 #include <QGuiApplication>
 #include <QScreen>
 #include <QDateTime>
-#include <optional>
 #include "FluTools.h"
 
 #ifdef Q_OS_WIN
 
-static DwmSetWindowAttributeFunc pDwmSetWindowAttribute = nullptr;
+#pragma comment (lib, "user32.lib")
-static DwmExtendFrameIntoClientAreaFunc pDwmExtendFrameIntoClientArea = nullptr;
+#pragma comment (lib, "dwmapi.lib")
-static DwmIsCompositionEnabledFunc pDwmIsCompositionEnabled = nullptr;
-static DwmEnableBlurBehindWindowFunc pDwmEnableBlurBehindWindow = nullptr;
-static SetWindowCompositionAttributeFunc pSetWindowCompositionAttribute = nullptr;
-static GetDpiForWindowFunc pGetDpiForWindow = nullptr;
-static GetSystemMetricsForDpiFunc pGetSystemMetricsForDpi = nullptr;
 
-static RTL_OSVERSIONINFOW GetRealOSVersionImpl() {
+#include <windows.h>
-    HMODULE hMod = ::GetModuleHandleW(L"ntdll.dll");
+#include <windowsx.h>
-    using RtlGetVersionPtr = NTSTATUS(WINAPI *)(PRTL_OSVERSIONINFOW);
+#include <dwmapi.h>
-    auto pRtlGetVersion =
-        reinterpret_cast<RtlGetVersionPtr>(::GetProcAddress(hMod, "RtlGetVersion"));
-    RTL_OSVERSIONINFOW rovi{};
-    rovi.dwOSVersionInfoSize = sizeof(rovi);
-    pRtlGetVersion(&rovi);
-    return rovi;
-}
-
-RTL_OSVERSIONINFOW GetRealOSVersion() {
-    static const auto result = GetRealOSVersionImpl();
-    return result;
-}
-
-static inline bool isWin8OrGreater() {
-    RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
-    return (rovi.dwMajorVersion > 6) || (rovi.dwMajorVersion == 6 && rovi.dwMinorVersion >= 2);
-}
-
-static inline bool isWin8Point1OrGreater() {
-    RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
-    return (rovi.dwMajorVersion > 6) || (rovi.dwMajorVersion == 6 && rovi.dwMinorVersion >= 3);
-}
-
-static inline bool isWin10OrGreater() {
-    RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
-    return (rovi.dwMajorVersion > 10) || (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0);
-}
-
-static inline bool isWin101809OrGreater() {
-    RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
-    return (rovi.dwMajorVersion > 10) ||
-           (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 && rovi.dwBuildNumber >= 17763);
-}
-
-static inline bool isWin101903OrGreater() {
-    RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
-    return (rovi.dwMajorVersion > 10) ||
-           (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 && rovi.dwBuildNumber >= 18362);
-}
-
-static inline bool isWin11OrGreater() {
-    RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
-    return (rovi.dwMajorVersion > 10) ||
-           (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 && rovi.dwBuildNumber >= 22000);
-}
-
-static inline bool isWin1122H2OrGreater() {
-    RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
-    return (rovi.dwMajorVersion > 10) ||
-           (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 && rovi.dwBuildNumber >= 22621);
-}
-
-static inline bool isWin10Only() {
-    return isWin10OrGreater() && !isWin11OrGreater();
-}
-
-static inline bool isWin7Only() {
-    RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
-    return rovi.dwMajorVersion == 7;
-}
 
 static inline QByteArray qtNativeEventType() {
     static const auto result = "windows_generic_MSG";
     return result;
 }
 
-static inline bool initializeFunctionPointers() {
-    HMODULE module = LoadLibraryW(L"dwmapi.dll");
-    if (module) {
-        if (!pDwmSetWindowAttribute) {
-            pDwmSetWindowAttribute = reinterpret_cast<DwmSetWindowAttributeFunc>(
-                GetProcAddress(module, "DwmSetWindowAttribute"));
-            if (!pDwmSetWindowAttribute) {
-                return false;
-            }
-        }
-        if (!pDwmExtendFrameIntoClientArea) {
-            pDwmExtendFrameIntoClientArea = reinterpret_cast<DwmExtendFrameIntoClientAreaFunc>(
-                GetProcAddress(module, "DwmExtendFrameIntoClientArea"));
-            if (!pDwmExtendFrameIntoClientArea) {
-                return false;
-            }
-        }
-        if (!pDwmIsCompositionEnabled) {
-            pDwmIsCompositionEnabled = reinterpret_cast<DwmIsCompositionEnabledFunc>(
-                ::GetProcAddress(module, "DwmIsCompositionEnabled"));
-            if (!pDwmIsCompositionEnabled) {
-                return false;
-            }
-        }
-        if (!pDwmEnableBlurBehindWindow) {
-            pDwmEnableBlurBehindWindow = reinterpret_cast<DwmEnableBlurBehindWindowFunc>(
-                GetProcAddress(module, "DwmEnableBlurBehindWindow"));
-            if (!pDwmEnableBlurBehindWindow) {
-                return false;
-            }
-        }
-    }
-
-    HMODULE user32 = LoadLibraryW(L"user32.dll");
-    if (module) {
-        if (!pSetWindowCompositionAttribute) {
-            pSetWindowCompositionAttribute = reinterpret_cast<SetWindowCompositionAttributeFunc>(
-                GetProcAddress(user32, "SetWindowCompositionAttribute"));
-            if (!pSetWindowCompositionAttribute) {
-                return false;
-            }
-        }
-
-        if (!pGetDpiForWindow) {
-            pGetDpiForWindow =
-                reinterpret_cast<GetDpiForWindowFunc>(GetProcAddress(user32, "GetDpiForWindow"));
-            if (!pGetDpiForWindow) {
-                return false;
-            }
-        }
-
-        if (!pGetSystemMetricsForDpi) {
-            pGetSystemMetricsForDpi = reinterpret_cast<GetSystemMetricsForDpiFunc>(
-                GetProcAddress(user32, "GetSystemMetricsForDpi"));
-            if (!pGetSystemMetricsForDpi) {
-                return false;
-            }
-        }
-    }
-
-
-    return true;
-}
-
 static inline bool isCompositionEnabled() {
-    if (initializeFunctionPointers()) {
+    typedef HRESULT (WINAPI *DwmIsCompositionEnabledPtr)(BOOL *pfEnabled);
+    HMODULE module = ::LoadLibraryW(L"dwmapi.dll");
+    if (module) {
         BOOL composition_enabled = false;
-        pDwmIsCompositionEnabled(&composition_enabled);
+        DwmIsCompositionEnabledPtr dwm_is_composition_enabled;
+        dwm_is_composition_enabled = reinterpret_cast<DwmIsCompositionEnabledPtr>(::GetProcAddress(module, "DwmIsCompositionEnabled"));
+        if (dwm_is_composition_enabled) {
+            dwm_is_composition_enabled(&composition_enabled);
+        }
         return composition_enabled;
     }
     return false;
@@ -161,195 +37,15 @@ static inline bool isCompositionEnabled() {
 
 static inline void setShadow(HWND hwnd) {
     const MARGINS shadow = {1, 0, 0, 0};
-    if (initializeFunctionPointers()) {
+    typedef HRESULT (WINAPI *DwmExtendFrameIntoClientAreaPtr)(HWND hWnd, const MARGINS *pMarInset);
-        pDwmExtendFrameIntoClientArea(hwnd, &shadow);
+    HMODULE module = LoadLibraryW(L"dwmapi.dll");
-    }
+    if (module) {
-    if (isWin7Only()) {
+        DwmExtendFrameIntoClientAreaPtr dwm_extendframe_into_client_area_;
-        SetClassLong(hwnd, GCL_STYLE, GetClassLong(hwnd, GCL_STYLE) | CS_DROPSHADOW);
+        dwm_extendframe_into_client_area_ = reinterpret_cast<DwmExtendFrameIntoClientAreaPtr>(GetProcAddress(module, "DwmExtendFrameIntoClientArea"));
-    }
+        if (dwm_extendframe_into_client_area_) {
-}
+            dwm_extendframe_into_client_area_(hwnd, &shadow);
-
-static inline bool setWindowDarkMode(HWND hwnd, const BOOL enable) {
-    if (!initializeFunctionPointers()) {
-        return false;
-    }
-    return bool(pDwmSetWindowAttribute(hwnd, 20, &enable, sizeof(BOOL)));
-}
-
-static inline std::optional<MONITORINFOEXW> getMonitorForWindow(const HWND hwnd) {
-    Q_ASSERT(hwnd);
-    if (!hwnd) {
-        return std::nullopt;
-    }
-    const HMONITOR monitor = ::MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
-    if (!monitor) {
-        return std::nullopt;
-    }
-    MONITORINFOEXW monitorInfo;
-    ::SecureZeroMemory(&monitorInfo, sizeof(monitorInfo));
-    monitorInfo.cbSize = sizeof(monitorInfo);
-    if (::GetMonitorInfoW(monitor, &monitorInfo) == FALSE) {
-        return std::nullopt;
-    }
-    return monitorInfo;
-};
-
-static inline bool isFullScreen(const HWND hwnd) {
-    RECT windowRect = {};
-    if (::GetWindowRect(hwnd, &windowRect) == FALSE) {
-        return false;
-    }
-    const std::optional<MONITORINFOEXW> mi = getMonitorForWindow(hwnd);
-    if (!mi.has_value()) {
-        return false;
-    }
-    RECT rcMonitor = mi.value().rcMonitor;
-    return windowRect.top == rcMonitor.top && windowRect.left == rcMonitor.left &&
-           windowRect.right == rcMonitor.right && windowRect.bottom == rcMonitor.bottom;
-}
-
-static inline bool isMaximized(const HWND hwnd) {
-    WINDOWPLACEMENT wp;
-    ::GetWindowPlacement(hwnd, &wp);
-    return wp.showCmd == SW_MAXIMIZE;
-}
-
-static inline quint32 getDpiForWindow(const HWND hwnd, const bool horizontal) {
-    if (const UINT dpi = pGetDpiForWindow(hwnd)) {
-        return dpi;
-    }
-    if (const HDC hdc = ::GetDC(hwnd)) {
-        bool valid = false;
-        const int dpiX = ::GetDeviceCaps(hdc, LOGPIXELSX);
-        const int dpiY = ::GetDeviceCaps(hdc, LOGPIXELSY);
-        if ((dpiX > 0) && (dpiY > 0)) {
-            valid = true;
-        }
-        ::ReleaseDC(hwnd, hdc);
-        if (valid) {
-            return (horizontal ? dpiX : dpiY);
         }
     }
-    return 96;
-}
-
-static inline int getSystemMetrics(const HWND hwnd, const int index, const bool horizontal) {
-    const UINT dpi = getDpiForWindow(hwnd, horizontal);
-    if (const int result = pGetSystemMetricsForDpi(index, dpi); result > 0) {
-        return result;
-    }
-    return ::GetSystemMetrics(index);
-}
-
-static inline quint32 getResizeBorderThickness(const HWND hwnd, const bool horizontal,
-                                               const qreal devicePixelRatio) {
-    auto frame = horizontal ? SM_CXSIZEFRAME : SM_CYSIZEFRAME;
-    auto result =
-        getSystemMetrics(hwnd, frame, horizontal) + getSystemMetrics(hwnd, 92, horizontal);
-    if (result > 0) {
-        return result;
-    }
-    int thickness = isCompositionEnabled() ? 8 : 4;
-    return qRound(thickness * devicePixelRatio);
-}
-
-static inline bool setWindowEffect(HWND hwnd, const QString &key, const bool &enable) {
-    static constexpr const MARGINS extendedMargins = {-1, -1, -1, -1};
-    if (key == QStringLiteral("mica")) {
-        if (!isWin11OrGreater() || !initializeFunctionPointers()) {
-            return false;
-        }
-        if (enable) {
-            pDwmExtendFrameIntoClientArea(hwnd, &extendedMargins);
-            if (isWin1122H2OrGreater()) {
-                const DWORD backdropType = _DWMSBT_MAINWINDOW;
-                pDwmSetWindowAttribute(hwnd, 38, &backdropType, sizeof(backdropType));
-            } else {
-                const BOOL enable = TRUE;
-                pDwmSetWindowAttribute(hwnd, 1029, &enable, sizeof(enable));
-            }
-        } else {
-            if (isWin1122H2OrGreater()) {
-                const DWORD backdropType = _DWMSBT_AUTO;
-                pDwmSetWindowAttribute(hwnd, 38, &backdropType, sizeof(backdropType));
-            } else {
-                const BOOL enable = FALSE;
-                pDwmSetWindowAttribute(hwnd, 1029, &enable, sizeof(enable));
-            }
-        }
-        return true;
-    }
-
-    if (key == QStringLiteral("mica-alt")) {
-        if (!isWin1122H2OrGreater() || !initializeFunctionPointers()) {
-            return false;
-        }
-        if (enable) {
-            pDwmExtendFrameIntoClientArea(hwnd, &extendedMargins);
-            const DWORD backdropType = _DWMSBT_TABBEDWINDOW;
-            pDwmSetWindowAttribute(hwnd, 38, &backdropType, sizeof(backdropType));
-        } else {
-            const DWORD backdropType = _DWMSBT_AUTO;
-            pDwmSetWindowAttribute(hwnd, 38, &backdropType, sizeof(backdropType));
-        }
-        return true;
-    }
-
-    if (key == QStringLiteral("acrylic")) {
-        if (!isWin11OrGreater() || !initializeFunctionPointers()) {
-            return false;
-        }
-        if (enable) {
-            pDwmExtendFrameIntoClientArea(hwnd, &extendedMargins);
-            DWORD system_backdrop_type = _DWMSBT_TRANSIENTWINDOW;
-            pDwmSetWindowAttribute(hwnd, 38, &system_backdrop_type, sizeof(DWORD));
-        } else {
-            const DWORD backdropType = _DWMSBT_AUTO;
-            pDwmSetWindowAttribute(hwnd, 38, &backdropType, sizeof(backdropType));
-        }
-        return true;
-    }
-
-    if (key == QStringLiteral("dwm-blur")) {
-        if ((isWin7Only() && !isCompositionEnabled()) || !initializeFunctionPointers()) {
-            return false;
-        }
-        if (enable) {
-            if (isWin8OrGreater()) {
-                ACCENT_POLICY policy{};
-                policy.dwAccentState = ACCENT_ENABLE_BLURBEHIND;
-                policy.dwAccentFlags = ACCENT_NONE;
-                WINDOWCOMPOSITIONATTRIBDATA wcad{};
-                wcad.Attrib = WCA_ACCENT_POLICY;
-                wcad.pvData = &policy;
-                wcad.cbData = sizeof(policy);
-                pSetWindowCompositionAttribute(hwnd, &wcad);
-            } else {
-                DWM_BLURBEHIND bb{};
-                bb.fEnable = TRUE;
-                bb.dwFlags = DWM_BB_ENABLE;
-                pDwmEnableBlurBehindWindow(hwnd, &bb);
-            }
-        } else {
-            if (isWin8OrGreater()) {
-                ACCENT_POLICY policy{};
-                policy.dwAccentState = ACCENT_DISABLED;
-                policy.dwAccentFlags = ACCENT_NONE;
-                WINDOWCOMPOSITIONATTRIBDATA wcad{};
-                wcad.Attrib = WCA_ACCENT_POLICY;
-                wcad.pvData = &policy;
-                wcad.cbData = sizeof(policy);
-                pSetWindowCompositionAttribute(hwnd, &wcad);
-            } else {
-                DWM_BLURBEHIND bb{};
-                bb.fEnable = FALSE;
-                bb.dwFlags = DWM_BB_ENABLE;
-                pDwmEnableBlurBehindWindow(hwnd, &bb);
-            }
-        }
-        return true;
-    }
-    return false;
 }
 
 #endif
@@ -374,8 +70,6 @@ FluFrameless::FluFrameless(QQuickItem *parent) : QQuickItem{parent} {
     _closeButton = nullptr;
     _topmost = false;
     _disabled = false;
-    _effect = "normal";
-    _effective = false;
     _isWindows11OrGreater = FluTools::getInstance()->isWindows11OrGreater();
 }
 
@@ -386,62 +80,16 @@ FluFrameless::~FluFrameless() = default;
 }
 
 void FluFrameless::componentComplete() {
-#ifdef Q_OS_WIN
-    HWND hwnd = reinterpret_cast<HWND>(window()->winId());
-    if (isWin11OrGreater()) {
-        availableEffects({"mica", "mica-alt", "acrylic", "dwm-blur", "normal"});
-    } else {
-        availableEffects({"dwm-blur", "normal"});
-    }
-    if (!_effect.isEmpty() && _useSystemEffect) {
-        effective(setWindowEffect(hwnd, _effect, true));
-        if (effective()) {
-            _currentEffect = effect();
-        }
-    }
-    connect(this, &FluFrameless::effectChanged, this, [hwnd, this] {
-        if (effect() == _currentEffect) {
-            return;
-        }
-        if (effective()) {
-            setWindowEffect(hwnd, _currentEffect, false);
-        }
-        effective(setWindowEffect(hwnd, effect(), true));
-        if (effective()) {
-            _currentEffect = effect();
-            _useSystemEffect = true;
-        } else {
-            _effect = "normal";
-            _currentEffect = "normal";
-            _useSystemEffect = false;
-        }
-    });
-    connect(this, &FluFrameless::useSystemEffectChanged, this, [this] {
-        if (!_useSystemEffect) {
-            effect("normal");
-        }
-    });
-    connect(this, &FluFrameless::isDarkModeChanged, this, [hwnd, this] {
-        if (effective() && !_currentEffect.isEmpty() && _currentEffect != "normal") {
-            setWindowDarkMode(hwnd, _isDarkMode);
-        }
-    });
-#endif
     if (_disabled) {
         return;
     }
     int w = window()->width();
     int h = window()->height();
     _current = window()->winId();
-#ifdef Q_OS_MACOS
+    window()->setFlags((window()->flags()) | Qt::CustomizeWindowHint | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint);
-    window()->setFlag(Qt::FramelessWindowHint, true);
+    if (!_fixSize) {
-    window()->setProperty("__borderWidth", 1);
+        window()->setFlag(Qt::WindowMaximizeButtonHint);
-#endif
+    }
-#ifdef Q_OS_LINUX
-    window()->setFlag(Qt::CustomizeWindowHint, true);
-    window()->setFlag(Qt::FramelessWindowHint, true);
-    window()->setProperty("__borderWidth", 1);
-#endif
     window()->installEventFilter(this);
     QGuiApplication::instance()->installNativeEventFilter(this);
     if (_maximizeButton) {
@@ -454,36 +102,24 @@ void FluFrameless::componentComplete() {
         setHitTestVisible(_closeButton);
     }
 #ifdef Q_OS_WIN
-#  if (QT_VERSION == QT_VERSION_CHECK(6, 5, 3))
+#if (QT_VERSION == QT_VERSION_CHECK(6, 5, 3))
-    qWarning()
+    qWarning()<<"Qt's own frameless bug, currently only exist in 6.5.3, please use other versions";
-        << "Qt's own frameless bug, currently only exist in 6.5.3, please use other versions";
+#endif
-#  endif
+    HWND hwnd = reinterpret_cast<HWND>(window()->winId());
-    if (!hwnd) {
-        hwnd = reinterpret_cast<HWND>(window()->winId());
-    }
     DWORD style = ::GetWindowLongPtr(hwnd, GWL_STYLE);
-#  if (QT_VERSION == QT_VERSION_CHECK(6, 7, 2))
-    style &= ~(WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_SYSMENU);
-#  endif
     if (_fixSize) {
-        ::SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_THICKFRAME | WS_CAPTION);
+        ::SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_THICKFRAME | WS_CAPTION);;
-        ;
         for (int i = 0; i <= QGuiApplication::screens().count() - 1; ++i) {
-            connect(
+            connect(QGuiApplication::screens().at(i), &QScreen::logicalDotsPerInchChanged, this, [=] {
-                QGuiApplication::screens().at(i), &QScreen::logicalDotsPerInchChanged, this, [=] {
+                SetWindowPos(hwnd, nullptr, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOMOVE | SWP_FRAMECHANGED);
-                    SetWindowPos(hwnd, nullptr, 0, 0, 0, 0,
+            });
-                                 SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOMOVE | SWP_FRAMECHANGED);
-                });
         }
     } else {
         ::SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_MAXIMIZEBOX | WS_THICKFRAME | WS_CAPTION);
     }
-    SetWindowPos(hwnd, nullptr, 0, 0, 0, 0,
+    SetWindowPos(hwnd, nullptr, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);
-                 SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);
     connect(window(), &QQuickWindow::screenChanged, this, [hwnd] {
-        ::SetWindowPos(hwnd, nullptr, 0, 0, 0, 0,
+        ::SetWindowPos(hwnd, nullptr, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED | SWP_NOOWNERZORDER);
-                       SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED |
-                           SWP_NOOWNERZORDER);
         ::RedrawWindow(hwnd, nullptr, nullptr, RDW_INVALIDATE | RDW_UPDATENOW);
     });
     if (!window()->property("_hideShadow").toBool()) {
@@ -500,12 +136,13 @@ void FluFrameless::componentComplete() {
         window()->setMaximumHeight(window()->maximumHeight() + appBarHeight);
     }
     window()->resize(QSize(w, h));
-    connect(this, &FluFrameless::topmostChanged, this, [this] { _setWindowTopmost(topmost()); });
+    connect(this, &FluFrameless::topmostChanged, this, [this] {
+        _setWindowTopmost(topmost());
+    });
     _setWindowTopmost(topmost());
 }
 
-[[maybe_unused]] bool FluFrameless::nativeEventFilter(const QByteArray &eventType, void *message,
+[[maybe_unused]] bool FluFrameless::nativeEventFilter(const QByteArray &eventType, void *message, QT_NATIVE_EVENT_RESULT_TYPE *result) {
-                                                      QT_NATIVE_EVENT_RESULT_TYPE *result) {
 #ifdef Q_OS_WIN
     if ((eventType != qtNativeEventType()) || !message) {
         return false;
@@ -526,71 +163,19 @@ void FluFrameless::componentComplete() {
         auto *wp = reinterpret_cast<WINDOWPOS *>(lParam);
         if (wp != nullptr && (wp->flags & SWP_NOSIZE) == 0) {
             wp->flags |= SWP_NOCOPYBITS;
-            *result = static_cast<QT_NATIVE_EVENT_RESULT_TYPE>(
+            *result = static_cast<QT_NATIVE_EVENT_RESULT_TYPE>(::DefWindowProcW(hwnd, uMsg, wParam, lParam));
-                ::DefWindowProcW(hwnd, uMsg, wParam, lParam));
             return true;
         }
         return false;
     } else if (uMsg == WM_NCCALCSIZE && wParam == TRUE) {
-        const auto clientRect =
+        bool isMaximum = ::IsZoomed(hwnd);
-            ((wParam == FALSE) ? reinterpret_cast<LPRECT>(lParam)
+        if (isMaximum) {
-                               : &(reinterpret_cast<LPNCCALCSIZE_PARAMS>(lParam))->rgrc[0]);
+            window()->setProperty("__margins",7);
-        bool isMax = ::isMaximized(hwnd);
+        }else{
-        bool isFull = ::isFullScreen(hwnd);
+            window()->setProperty("__margins",0);
-        if (isMax && !isFull) {
-            auto ty = getResizeBorderThickness(hwnd, false, window()->devicePixelRatio());
-            clientRect->top += ty;
-            clientRect->bottom -= ty;
-            auto tx = getResizeBorderThickness(hwnd, true, window()->devicePixelRatio());
-            clientRect->left += tx;
-            clientRect->right -= tx;
         }
-        if (isMax || isFull) {
+        _setMaximizeHovered(false);
-            APPBARDATA abd;
+        *result = WVR_REDRAW;
-            SecureZeroMemory(&abd, sizeof(abd));
-            abd.cbSize = sizeof(abd);
-            const UINT taskbarState = ::SHAppBarMessage(ABM_GETSTATE, &abd);
-            if (taskbarState & ABS_AUTOHIDE) {
-                bool top = false, bottom = false, left = false, right = false;
-                int edge = -1;
-                APPBARDATA abd2;
-                SecureZeroMemory(&abd2, sizeof(abd2));
-                abd2.cbSize = sizeof(abd2);
-                abd2.hWnd = ::FindWindowW(L"Shell_TrayWnd", nullptr);
-                if (abd2.hWnd) {
-                    const HMONITOR windowMonitor =
-                        ::MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
-                    if (windowMonitor) {
-                        const HMONITOR taskbarMonitor =
-                            ::MonitorFromWindow(abd2.hWnd, MONITOR_DEFAULTTOPRIMARY);
-                        if (taskbarMonitor) {
-                            if (taskbarMonitor == windowMonitor) {
-                                ::SHAppBarMessage(ABM_GETTASKBARPOS, &abd2);
-                                edge = abd2.uEdge;
-                            }
-                        }
-                    }
-                }
-                top = (edge == ABE_TOP);
-                bottom = (edge == ABE_BOTTOM);
-                left = (edge == ABE_LEFT);
-                right = (edge == ABE_RIGHT);
-                if (top) {
-                    clientRect->top += 1;
-                } else if (bottom) {
-                    clientRect->bottom -= 1;
-                } else if (left) {
-                    clientRect->left += 1;
-                } else if (right) {
-                    clientRect->right -= 1;
-                } else {
-                    clientRect->bottom -= 1;
-                }
-            } else {
-                clientRect->bottom += 1;
-            }
-        }
-        *result = 0;
         return true;
     } else if (uMsg == WM_NCHITTEST) {
         if (_isWindows11OrGreater) {
@@ -646,29 +231,21 @@ void FluFrameless::componentComplete() {
         *result = HTCLIENT;
         return true;
     } else if (uMsg == WM_NCPAINT) {
-        if (isCompositionEnabled() && !this->_isFullScreen()) {
-            return false;
-        }
         *result = FALSE;
-        return true;
+        return false;
     } else if (uMsg == WM_NCACTIVATE) {
-        if (isCompositionEnabled()) {
+        *result = TRUE;
-            return false;
-        }
-        *result = true;
         return true;
     } else if (_isWindows11OrGreater && (uMsg == WM_NCLBUTTONDBLCLK || uMsg == WM_NCLBUTTONDOWN)) {
         if (_hitMaximizeButton()) {
-            QMouseEvent event = QMouseEvent(QEvent::MouseButtonPress, QPoint(), QPoint(),
+            QMouseEvent event = QMouseEvent(QEvent::MouseButtonPress, QPoint(), QPoint(), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
-                                            Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
             QGuiApplication::sendEvent(_maximizeButton, &event);
             _setMaximizePressed(true);
             return true;
         }
     } else if (_isWindows11OrGreater && (uMsg == WM_NCLBUTTONUP || uMsg == WM_NCRBUTTONUP)) {
         if (_hitMaximizeButton()) {
-            QMouseEvent event = QMouseEvent(QEvent::MouseButtonRelease, QPoint(), QPoint(),
+            QMouseEvent event = QMouseEvent(QEvent::MouseButtonRelease, QPoint(), QPoint(), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
-                                            Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
             QGuiApplication::sendEvent(_maximizeButton, &event);
             _setMaximizePressed(false);
             return true;
@@ -723,8 +300,7 @@ void FluFrameless::_showSystemMenu(QPoint point) {
         return;
     }
     const QPoint origin = screen->geometry().topLeft();
-    auto nativePos =
+    auto nativePos = QPointF(QPointF(point - origin) * window()->devicePixelRatio()).toPoint() + origin;
-        QPointF(QPointF(point - origin) * window()->devicePixelRatio()).toPoint() + origin;
     HWND hwnd = reinterpret_cast<HWND>(window()->winId());
     auto hMenu = ::GetSystemMenu(hwnd, FALSE);
     if (_isMaximized() || _isFullScreen()) {
@@ -741,10 +317,8 @@ void FluFrameless::_showSystemMenu(QPoint point) {
         ::EnableMenuItem(hMenu, SC_SIZE, MFS_DISABLED);
         ::EnableMenuItem(hMenu, SC_MAXIMIZE, MFS_DISABLED);
     }
-    const int result = ::TrackPopupMenu(
+    const int result = ::TrackPopupMenu(hMenu, (TPM_RETURNCMD | (QGuiApplication::isRightToLeft() ? TPM_RIGHTALIGN : TPM_LEFTALIGN)), nativePos.x(),
-        hMenu,
+                                        nativePos.y(), 0, hwnd, nullptr);
-        (TPM_RETURNCMD | (QGuiApplication::isRightToLeft() ? TPM_RIGHTALIGN : TPM_LEFTALIGN)),
-        nativePos.x(), nativePos.y(), 0, hwnd, nullptr);
     if (result) {
         ::PostMessageW(hwnd, WM_SYSCOMMAND, result, 0);
     }
@@ -785,27 +359,27 @@ void FluFrameless::_setMaximizeHovered(bool val) {
 
 void FluFrameless::_updateCursor(int edges) {
     switch (edges) {
-        case 0:
+    case 0:
-            window()->setCursor(Qt::ArrowCursor);
+        window()->setCursor(Qt::ArrowCursor);
-            break;
+        break;
-        case Qt::LeftEdge:
+    case Qt::LeftEdge:
-        case Qt::RightEdge:
+    case Qt::RightEdge:
-            window()->setCursor(Qt::SizeHorCursor);
+        window()->setCursor(Qt::SizeHorCursor);
-            break;
+        break;
-        case Qt::TopEdge:
+    case Qt::TopEdge:
-        case Qt::BottomEdge:
+    case Qt::BottomEdge:
-            window()->setCursor(Qt::SizeVerCursor);
+        window()->setCursor(Qt::SizeVerCursor);
-            break;
+        break;
-        case Qt::LeftEdge | Qt::TopEdge:
+    case Qt::LeftEdge | Qt::TopEdge:
-        case Qt::RightEdge | Qt::BottomEdge:
+    case Qt::RightEdge | Qt::BottomEdge:
-            window()->setCursor(Qt::SizeFDiagCursor);
+        window()->setCursor(Qt::SizeFDiagCursor);
-            break;
+        break;
-        case Qt::RightEdge | Qt::TopEdge:
+    case Qt::RightEdge | Qt::TopEdge:
-        case Qt::LeftEdge | Qt::BottomEdge:
+    case Qt::LeftEdge | Qt::BottomEdge:
-            window()->setCursor(Qt::SizeBDiagCursor);
+        window()->setCursor(Qt::SizeBDiagCursor);
-            break;
+        break;
-        default:
+    default:
-            break;
+        break;
     }
 }
 
@@ -850,80 +424,79 @@ void FluFrameless::_setWindowTopmost(bool topmost) {
         ::SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
     }
 #else
-    window()->setFlag(Qt::WindowStaysOnTopHint, topmost);
+    window()->setFlag(Qt::WindowStaysOnTopHint,topmost);
 #endif
 }
 
 bool FluFrameless::eventFilter(QObject *obj, QEvent *ev) {
 #ifndef Q_OS_WIN
     switch (ev->type()) {
-        case QEvent::MouseButtonPress:
+    case QEvent::MouseButtonPress:
-            if (_edges != 0) {
+        if(_edges!=0){
-                QMouseEvent *event = static_cast<QMouseEvent *>(ev);
+            QMouseEvent *event = static_cast<QMouseEvent*>(ev);
-                if (event->button() == Qt::LeftButton) {
+            if(event->button() == Qt::LeftButton){
-                    _updateCursor(_edges);
+                _updateCursor(_edges);
-                    window()->startSystemResize(Qt::Edges(_edges));
+                window()->startSystemResize(Qt::Edges(_edges));
-                }
+            }
-            } else {
+        }else{
-                if (_hitAppBar()) {
+            if(_hitAppBar()){
-                    qint64 clickTimer = QDateTime::currentMSecsSinceEpoch();
+                qint64 clickTimer = QDateTime::currentMSecsSinceEpoch();
-                    qint64 offset = clickTimer - this->_clickTimer;
+                qint64 offset =  clickTimer - this->_clickTimer;
-                    this->_clickTimer = clickTimer;
+                this->_clickTimer = clickTimer;
-                    if (offset < 300) {
+                if(offset<300){
-                        if (_isMaximized()) {
+                    if(_isMaximized()){
-                            showNormal();
+                        showNormal();
-                        } else {
+                    }else{
-                            showMaximized();
+                        showMaximized();
-                        }
-                    } else {
-                        window()->startSystemMove();
                     }
+                }else{
+                    window()->startSystemMove();
                 }
             }
-            break;
+        }
-        case QEvent::MouseButtonRelease:
+        break;
-            _edges = 0;
+    case QEvent::MouseButtonRelease:
-            break;
+        _edges = 0;
-        case QEvent::MouseMove: {
+        break;
-            if (_isMaximized() || _isFullScreen()) {
+    case QEvent::MouseMove: {
-                break;
+        if(_isMaximized() || _isFullScreen()){
-            }
-            if (_fixSize) {
-                break;
-            }
-            QMouseEvent *event = static_cast<QMouseEvent *>(ev);
-            QPoint p =
-#  if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-                event->pos();
-#  else
-                event->position().toPoint();
-#  endif
-            if (p.x() >= _margins && p.x() <= (window()->width() - _margins) && p.y() >= _margins &&
-                p.y() <= (window()->height() - _margins)) {
-                if (_edges != 0) {
-                    _edges = 0;
-                    _updateCursor(_edges);
-                }
-                break;
-            }
-            _edges = 0;
-            if (p.x() < _margins) {
-                _edges |= Qt::LeftEdge;
-            }
-            if (p.x() > (window()->width() - _margins)) {
-                _edges |= Qt::RightEdge;
-            }
-            if (p.y() < _margins) {
-                _edges |= Qt::TopEdge;
-            }
-            if (p.y() > (window()->height() - _margins)) {
-                _edges |= Qt::BottomEdge;
-            }
-            _updateCursor(_edges);
             break;
         }
-        default:
+        if(_fixSize){
             break;
+        }
+        QMouseEvent *event = static_cast<QMouseEvent*>(ev);
+        QPoint p =
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
+            event->pos();
+#else
+            event->position().toPoint();
+#endif
+        if(p.x() >= _margins && p.x() <= (window()->width() - _margins) && p.y() >= _margins && p.y() <= (window()->height() - _margins)){
+            if(_edges != 0){
+                _edges = 0;
+                _updateCursor(_edges);
+            }
+            break;
+        }
+        _edges = 0;
+        if ( p.x() < _margins ) {
+            _edges |= Qt::LeftEdge;
+        }
+        if ( p.x() > (window()->width() - _margins) ) {
+            _edges |= Qt::RightEdge;
+        }
+        if ( p.y() < _margins ) {
+            _edges |= Qt::TopEdge;
+        }
+        if ( p.y() > (window()->height() - _margins) ) {
+            _edges |= Qt::BottomEdge;
+        }
+        _updateCursor(_edges);
+        break;
+    }
+    default:
+        break;
     }
 #endif
     return QObject::eventFilter(obj, ev);

src/FluFrameless.h

@@ -6,102 +6,6 @@
 #include <QQmlProperty>
 #include "stdafx.h"
 
-#ifdef Q_OS_WIN
-
-#  pragma comment(lib, "user32.lib")
-#  pragma comment(lib, "dwmapi.lib")
-
-#  include <windows.h>
-#  include <windowsx.h>
-#  include <dwmapi.h>
-enum _DWM_SYSTEMBACKDROP_TYPE {
-    _DWMSBT_AUTO, // [Default] Let DWM automatically decide the system-drawn backdrop for this
-    // window.
-    _DWMSBT_NONE,       // [Disable] Do not draw any system backdrop.
-    _DWMSBT_MAINWINDOW, // [Mica] Draw the backdrop material effect corresponding to a
-    // long-lived window.
-    _DWMSBT_TRANSIENTWINDOW, // [Acrylic] Draw the backdrop material effect corresponding to a
-    // transient window.
-    _DWMSBT_TABBEDWINDOW, // [Mica Alt] Draw the backdrop material effect corresponding to a
-    // window with a tabbed title bar.
-};
-enum WINDOWCOMPOSITIONATTRIB {
-    WCA_UNDEFINED = 0,
-    WCA_NCRENDERING_ENABLED = 1,
-    WCA_NCRENDERING_POLICY = 2,
-    WCA_TRANSITIONS_FORCEDISABLED = 3,
-    WCA_ALLOW_NCPAINT = 4,
-    WCA_CAPTION_BUTTON_BOUNDS = 5,
-    WCA_NONCLIENT_RTL_LAYOUT = 6,
-    WCA_FORCE_ICONIC_REPRESENTATION = 7,
-    WCA_EXTENDED_FRAME_BOUNDS = 8,
-    WCA_HAS_ICONIC_BITMAP = 9,
-    WCA_THEME_ATTRIBUTES = 10,
-    WCA_NCRENDERING_EXILED = 11,
-    WCA_NCADORNMENTINFO = 12,
-    WCA_EXCLUDED_FROM_LIVEPREVIEW = 13,
-    WCA_VIDEO_OVERLAY_ACTIVE = 14,
-    WCA_FORCE_ACTIVEWINDOW_APPEARANCE = 15,
-    WCA_DISALLOW_PEEK = 16,
-    WCA_CLOAK = 17,
-    WCA_CLOAKED = 18,
-    WCA_ACCENT_POLICY = 19,
-    WCA_FREEZE_REPRESENTATION = 20,
-    WCA_EVER_UNCLOAKED = 21,
-    WCA_VISUAL_OWNER = 22,
-    WCA_HOLOGRAPHIC = 23,
-    WCA_EXCLUDED_FROM_DDA = 24,
-    WCA_PASSIVEUPDATEMODE = 25,
-    WCA_USEDARKMODECOLORS = 26,
-    WCA_CORNER_STYLE = 27,
-    WCA_PART_COLOR = 28,
-    WCA_DISABLE_MOVESIZE_FEEDBACK = 29,
-    WCA_LAST = 30
-};
-
-enum ACCENT_STATE {
-    ACCENT_DISABLED = 0,
-    ACCENT_ENABLE_GRADIENT = 1,
-    ACCENT_ENABLE_TRANSPARENTGRADIENT = 2,
-    ACCENT_ENABLE_BLURBEHIND = 3,        // Traditional DWM blur
-    ACCENT_ENABLE_ACRYLICBLURBEHIND = 4, // RS4 1803
-    ACCENT_ENABLE_HOST_BACKDROP = 5,     // RS5 1809
-    ACCENT_INVALID_STATE = 6             // Using this value will remove the window background
-};
-
-enum ACCENT_FLAG {
-    ACCENT_NONE = 0,
-    ACCENT_ENABLE_ACRYLIC = 1,
-    ACCENT_ENABLE_ACRYLIC_WITH_LUMINOSITY = 482
-};
-
-struct ACCENT_POLICY {
-    DWORD dwAccentState;
-    DWORD dwAccentFlags;
-    DWORD dwGradientColor; // #AABBGGRR
-    DWORD dwAnimationId;
-};
-using PACCENT_POLICY = ACCENT_POLICY *;
-struct WINDOWCOMPOSITIONATTRIBDATA {
-    WINDOWCOMPOSITIONATTRIB Attrib;
-    PVOID pvData;
-    SIZE_T cbData;
-};
-using PWINDOWCOMPOSITIONATTRIBDATA = WINDOWCOMPOSITIONATTRIBDATA *;
-
-typedef HRESULT(WINAPI *DwmSetWindowAttributeFunc)(HWND hwnd, DWORD dwAttribute,
-                                                   LPCVOID pvAttribute, DWORD cbAttribute);
-typedef HRESULT(WINAPI *DwmExtendFrameIntoClientAreaFunc)(HWND hwnd, const MARGINS *pMarInset);
-typedef HRESULT(WINAPI *DwmIsCompositionEnabledFunc)(BOOL *pfEnabled);
-typedef HRESULT(WINAPI *DwmEnableBlurBehindWindowFunc)(HWND hWnd,
-                                                       const DWM_BLURBEHIND *pBlurBehind);
-typedef BOOL(WINAPI *SetWindowCompositionAttributeFunc)(HWND hwnd,
-                                                        const WINDOWCOMPOSITIONATTRIBDATA *);
-typedef UINT(WINAPI *GetDpiForWindowFunc)(HWND hWnd);
-typedef int(WINAPI *GetSystemMetricsForDpiFunc)(int nIndex, UINT dpi);
-
-#endif
-
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
 using QT_NATIVE_EVENT_RESULT_TYPE = qintptr;
 using QT_ENTER_EVENT_TYPE = QEnterEvent;
@@ -119,11 +23,6 @@ class FluFrameless : public QQuickItem, QAbstractNativeEventFilter {
     Q_PROPERTY_AUTO(bool, topmost)
     Q_PROPERTY_AUTO(bool, disabled)
     Q_PROPERTY_AUTO(bool, fixSize)
-    Q_PROPERTY_AUTO(QString, effect)
-    Q_PROPERTY_READONLY_AUTO(bool, effective)
-    Q_PROPERTY_READONLY_AUTO(QStringList, availableEffects)
-    Q_PROPERTY_AUTO(bool, isDarkMode)
-    Q_PROPERTY_AUTO(bool, useSystemEffect)
     QML_NAMED_ELEMENT(FluFrameless)
 public:
     explicit FluFrameless(QQuickItem *parent = nullptr);
@@ -169,7 +68,6 @@ private:
 
     void _setMaximizeHovered(bool val);
 
-
 private:
     quint64 _current = 0;
     int _edges = 0;
@@ -177,5 +75,4 @@ private:
     quint64 _clickTimer = 0;
     bool _isWindows11OrGreater = false;
     QList<QPointer<QQuickItem>> _hitTestList;
-    QString _currentEffect;
 };

src/FluTools.cpp

@@ -282,22 +282,7 @@ QString FluTools::getWallpaperFilePath() {
             auto path = result.mid(startIndex + 7, result.length() - startIndex - 8);
             return path;
         }
-    } else if (type == "ubuntu") {
-        QProcess process;
-        QStringList args;
-        args << "get";
-        args << "org.gnome.desktop.background";
-        args << "picture-uri";
-        process.start("gsettings", args);
-        process.waitForFinished();
-        QByteArray result = process.readAllStandardOutput().trimmed();
-        result = result.mid(1, result.length() - 2);
-        if (result.startsWith("file:///")) {
-            auto path = result.mid(7);
-            return path;
-        }
     }
-    return {};
 #elif defined(Q_OS_MACOS)
     QProcess process;
     QStringList args;

src/FluTreeModel.cpp

@@ -1,4 +1,4 @@
-#include "FluTreeModel.h"
+#include "FluTreeModel.h"
 
 #include <QMetaEnum>
 
@@ -107,7 +107,7 @@ void FluTreeModel::checkRow(int row, bool checked) {
 void FluTreeModel::setDataSource(QList<QMap<QString, QVariant>> data) {
     _dataSource.clear();
     if (_root) {
-        _root->deleteLater();
+        delete _root;
         _root = nullptr;
     }
     _root = new FluTreeNode(this);
@@ -115,7 +115,7 @@ void FluTreeModel::setDataSource(QList<QMap<QString, QVariant>> data) {
     while (data.count() > 0) {
         auto item = data.at(data.count() - 1);
         data.pop_back();
-        auto *node = new FluTreeNode(_root);
+        auto *node = new FluTreeNode(this);
         node->_depth = item.value("__depth").toInt();
         node->_parent = item.value("__parent").value<FluTreeNode *>();
         node->_data = item;
@@ -126,7 +126,6 @@ void FluTreeModel::setDataSource(QList<QMap<QString, QVariant>> data) {
             node->_parent = _root;
             _root->_children.append(node);
         }
-        node->_checked = item.value("checked").toBool();
         _dataSource.append(node);
         if (item.contains("children")) {
             QList<QVariant> children = item.value("children").toList();

src/FluentUI.cpp

@@ -23,14 +23,12 @@
 #include "qmlcustomplot/ticker.h"
 #include "qmlcustomplot/grid.h"
 
-const char* FluentUI::_uri = "FluentUI";
-
 void FluentUI::registerTypes(QQmlEngine *engine) {
     initializeEngine(engine, _uri);
     registerTypes(_uri);
 }
 
-void FluentUI::registerTypes(const char *uri) {
+void FluentUI::registerTypes(const char *uri) const {
 #if (QT_VERSION < QT_VERSION_CHECK(6, 2, 0))
     Q_INIT_RESOURCE(fluentui);
     int major = _major;
@@ -164,41 +162,31 @@ void FluentUI::registerTypes(const char *uri) {
     qmlRegisterUncreatableMetaObject(FluTimelineType::staticMetaObject, uri, major, minor, "FluTimelineType", "Access to enums & flags only");
     qmlRegisterUncreatableMetaObject(FluSheetType::staticMetaObject, uri, major, minor, "FluSheetType", "Access to enums & flags only");
 
-    qmlRegisterSingletonType<FluApp>(uri, major, minor, "FluApp",
+    qmlRegisterSingletonType(uri, major, minor, "FluApp", [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QJSValue {
-                                     [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QObject* {
+        Q_UNUSED(engine)
-                                         Q_UNUSED(scriptEngine)
+        return scriptEngine->newQObject(FluApp::getInstance());
-                                         QObject *instance = FluApp::getInstance();
+    });
-                                         engine->setObjectOwnership(instance, QQmlEngine::CppOwnership);
+    qmlRegisterSingletonType(uri, major, minor, "FluColors", [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QJSValue {
-                                         return instance;
+        Q_UNUSED(engine)
-                                     });
+        return scriptEngine->newQObject(FluColors::getInstance());
-    qmlRegisterSingletonType<FluColors>(uri, major, minor, "FluColors",
+    });
-                                        [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QObject* {
+    qmlRegisterSingletonType(uri, major, minor, "FluTheme", [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QJSValue {
-                                            Q_UNUSED(scriptEngine)
+        Q_UNUSED(engine)
-                                            QObject *instance = FluColors::getInstance();
+        return scriptEngine->newQObject(FluTheme::getInstance());
-                                            engine->setObjectOwnership(instance, QQmlEngine::CppOwnership);
+    });
-                                            return instance;
+    qmlRegisterSingletonType(uri, major, minor, "FluTools", [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QJSValue {
-                                        });
+        Q_UNUSED(engine)
-    qmlRegisterSingletonType<FluTheme>(uri, major, minor, "FluTheme",
+        return scriptEngine->newQObject(FluTools::getInstance());
-                                       [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QObject* {
+    });
-                                           Q_UNUSED(scriptEngine)
+    qmlRegisterSingletonType(uri, major, minor, "FluTextStyle", [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QJSValue {
-                                           QObject *instance = FluTheme::getInstance();
+        Q_UNUSED(engine)
-                                           engine->setObjectOwnership(instance, QQmlEngine::CppOwnership);
+        return scriptEngine->newQObject(FluTextStyle::getInstance());
-                                           return instance;
+    });
-                                       });
+//    qmlRegisterSingletonInstance(uri, major, minor, "FluApp", FluApp::getInstance());
-    qmlRegisterSingletonType<FluTools>(uri, major, minor, "FluTools",
+//    qmlRegisterSingletonInstance(uri, major, minor, "FluColors", FluColors::getInstance());
-                                       [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QObject* {
+//    qmlRegisterSingletonInstance(uri, major, minor, "FluTheme", FluTheme::getInstance());
-                                           Q_UNUSED(scriptEngine)
+//    qmlRegisterSingletonInstance(uri, major, minor, "FluTools", FluTools::getInstance());
-                                           QObject *instance = FluTools::getInstance();
+//    qmlRegisterSingletonInstance(uri, major, minor, "FluTextStyle", FluTextStyle::getInstance());
-                                           engine->setObjectOwnership(instance, QQmlEngine::CppOwnership);
-                                           return instance;
-                                       });
-    qmlRegisterSingletonType<FluTextStyle>(uri, major, minor, "FluTextStyle",
-                                           [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QObject* {
-                                               Q_UNUSED(scriptEngine)
-                                               QObject *instance = FluTextStyle::getInstance();
-                                               engine->setObjectOwnership(instance, QQmlEngine::CppOwnership);
-                                               return instance;
-                                           });
     qmlRegisterModule(uri, major, minor);
 #endif
 }

src/FluentUI.h

@@ -2,22 +2,25 @@
 
 #include <QObject>
 #include <QQmlEngine>
+#include "singleton.h"
 
 /**
  * @brief The FluentUI class
  */
-class FluentUI{
+class FluentUI : public QObject {
+    Q_OBJECT
 
 public:
+    SINGLETON(FluentUI)
 
-   static Q_DECL_EXPORT void registerTypes(QQmlEngine *engine);
+    Q_DECL_EXPORT void registerTypes(QQmlEngine *engine);
 
-   static void registerTypes(const char *uri);
+    void registerTypes(const char *uri) const;
 
-   static void initializeEngine(QQmlEngine *engine, [[maybe_unused]] const char *uri);
+    void initializeEngine(QQmlEngine *engine, [[maybe_unused]] const char *uri);
 
 private:
-   static const int _major = 1;
+    const int _major = 1;
-   static const int _minor = 0;
+    const int _minor = 0;
-   static const char *_uri;
+    const char *_uri = "FluentUI";
 };

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

@@ -73,7 +73,7 @@ Rectangle{
         text:{
             if(count<100)
                 return count
-            return "100+"
+            return count+"+"
         }
     }
 }

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

@@ -4,7 +4,6 @@ import FluentUI 1.0
 
 Item {
     property bool autoPlay: true
-    property int orientation: Qt.Horizontal
     property int loopTime: 2000
     property var model
     property Component delegate
@@ -15,7 +14,7 @@ Item {
     property int indicatorMarginTop: 0
     property int indicatorMarginBottom: 20
     property int indicatorSpacing: 10
-    property alias indicatorAnchors: indicator_loader.anchors
+    property alias indicatorAnchors: layout_indicator.anchors
     property Component indicatorDelegate : com_indicator
     id:control
     width: 400
@@ -25,24 +24,13 @@ Item {
     }
     QtObject{
         id:d
-        property bool isManualMoving: false
+        property bool flagXChanged: true
         property bool isAnimEnable: control.autoPlay && list_view.count>3
-        onIsAnimEnableChanged: {
-            if(isAnimEnable){
-                timer_run.restart()
-            }else{
-                timer_run.stop()
-            }
-        }
         function setData(data){
-            if(!data || !Array.isArray(data)){
+            if(!data){
                 return
             }
             content_model.clear()
-            list_view.resetPos()
-            if(data.length === 0){
-                return
-            }
             content_model.append(data[data.length-1])
             content_model.append(data)
             content_model.append(data[0])
@@ -61,7 +49,7 @@ Item {
         clip: true
         boundsBehavior: ListView.StopAtBounds
         model:content_model
-        maximumFlickVelocity: 4 * (control.orientation === Qt.Vertical ? height : width)
+        maximumFlickVelocity: 4 * (list_view.orientation === Qt.Horizontal ? width : height)
         preferredHighlightBegin: 0
         preferredHighlightEnd: 0
         highlightMoveDuration: 0
@@ -75,7 +63,7 @@ Item {
                 d.setData(control.model)
             }
         }
-        orientation : control.orientation
+        orientation : ListView.Horizontal
         delegate: Item{
             id:item_control
             width: ListView.view.width
@@ -100,63 +88,31 @@ Item {
             }
         }
         onMovementEnded:{
-            d.isManualMoving = false
+            currentIndex = list_view.contentX/list_view.width
-            list_view.highlightMoveDuration = 0
+            if(currentIndex === 0){
-            if(control.orientation === Qt.Vertical){
+                currentIndex = list_view.count-2
-                currentIndex = (list_view.contentY - list_view.originY) / list_view.height
+            }else if(currentIndex === list_view.count-1){
-                if(currentIndex === 0){
+                currentIndex = 1
-                    currentIndex = list_view.count - 2
-                }else if(currentIndex === list_view.count - 1) {
-                    currentIndex = 1
-                }
-            } else {
-                currentIndex = (list_view.contentX - list_view.originX) / list_view.width
-                if(currentIndex === 0){
-                    currentIndex = list_view.count - 2
-                }else if(currentIndex === list_view.count - 1){
-                    currentIndex = 1
-                }
-            }
-            if(d.isAnimEnable){
-                timer_run.restart()
             }
+            d.flagXChanged = false
+            timer_run.restart()
         }
         onMovementStarted: {
-            d.isManualMoving = true
+            d.flagXChanged = true
             timer_run.stop()
         }
         onContentXChanged: {
-            if(d.isManualMoving && control.orientation === Qt.Horizontal){
+            if(d.flagXChanged){
-                const range = getPosRange(list_view.width, currentIndex)
+                var maxX = Math.min(list_view.width*(currentIndex+1),list_view.count*list_view.width)
-                if(contentX >= range.max){
+                var minY = Math.max(0,(list_view.width*(currentIndex-1)))
-                    contentX = range.max
+                if(contentX>=maxX){
+                    contentX = maxX
                 }
-                if(contentX <= range.min){
+                if(contentX<=minY){
-                    contentX = range.min
+                    contentX = minY
                 }
             }
         }
-        onContentYChanged: {
-            if(d.isManualMoving && control.orientation === Qt.Vertical){
-                const range = getPosRange(list_view.height, currentIndex)
-                if(contentY >= range.max){
-                    contentY = range.max
-                }
-                if(contentY <= range.min){
-                    contentY = range.min
-                }
-            }
-        }
-        function resetPos() {
-            contentX = 0
-            contentY = 0
-        }
-        function getPosRange(size, index) {
-            return {
-                "min": Math.max(0, size * (index - 1)),
-                "max": Math.min(size * (index + 1), list_view.count * size)
-            }
-        }
     }
     Component{
         id:com_indicator
@@ -181,9 +137,9 @@ Item {
             }
         }
     }
-
+    Row{
-    Loader{
+        id:layout_indicator
-        id: indicator_loader
+        spacing: control.indicatorSpacing
         anchors{
             horizontalCenter:(indicatorGravity & Qt.AlignHCenter) ? parent.horizontalCenter : undefined
             verticalCenter: (indicatorGravity & Qt.AlignVCenter) ? parent.verticalCenter : undefined
@@ -196,66 +152,28 @@ Item {
             rightMargin: control.indicatorMarginBottom
             topMargin: control.indicatorMarginBottom
         }
-        active: showIndicator
+        visible: showIndicator
-        sourceComponent: control.orientation === Qt.Vertical ? column_indicator : row_indicator
+        Repeater{
-    }
+            id:repeater_indicator
-
+            model: list_view.count
-    Component{
+            FluLoader{
-        id: row_indicator
+                property int displayIndex: {
-        Row{
+                    if(index === 0)
-            id:layout_indicator
+                        return list_view.count-3
-            spacing: control.indicatorSpacing
+                    if(index === list_view.count-1)
-            Repeater{
+                        return 0
-                id:repeater_indicator
+                    return index-1
-                model: list_view.count
+                }
-                FluLoader{
+                property int realIndex: index
-                    property int displayIndex: {
+                property bool checked: list_view.currentIndex === index
-                        if(index === 0)
+                sourceComponent: {
-                            return list_view.count-3
+                    if(index===0 || index===list_view.count-1)
-                        if(index === list_view.count-1)
+                        return undefined
-                            return 0
+                    return control.indicatorDelegate
-                        return index-1
-                    }
-                    property int realIndex: index
-                    property bool checked: list_view.currentIndex === index
-                    sourceComponent: {
-                        if(index===0 || index===list_view.count-1)
-                            return undefined
-                        return control.indicatorDelegate
-                    }
                 }
             }
         }
     }
-
-    Component{
-        id: column_indicator
-        Column{
-            id:layout_indicator
-            spacing: control.indicatorSpacing
-            Repeater{
-                id:repeater_indicator
-                model: list_view.count
-                FluLoader{
-                    property int displayIndex: {
-                        if(index === 0)
-                            return list_view.count-3
-                        if(index === list_view.count-1)
-                            return 0
-                        return index-1
-                    }
-                    property int realIndex: index
-                    property bool checked: list_view.currentIndex === index
-                    sourceComponent: {
-                        if(index===0 || index===list_view.count-1)
-                            return undefined
-                        return control.indicatorDelegate
-                    }
-                }
-            }
-        }
-    }
-
     Timer{
         id:timer_anim
         interval: 250
@@ -277,10 +195,10 @@ Item {
         }
     }
     function changedIndex(index){
-        d.isManualMoving = true
+        d.flagXChanged = true
         timer_run.stop()
         list_view.currentIndex = index
-        d.isManualMoving = false
+        d.flagXChanged = false
         if(d.isAnimEnable){
             timer_run.restart()
         }

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

@@ -15,9 +15,7 @@ Canvas {
     function animateToNewData()
     {
         chartAnimationProgress = 0.1;
-        if (d.jsChart) {
+        d.jsChart.update();
-            d.jsChart.update();
-        }
         chartAnimator.restart();
     }
     QtObject{

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

@@ -19,19 +19,7 @@ Button {
     property color checkedDisableColor: FluTheme.dark ? Qt.rgba(82/255,82/255,82/255,1) : Qt.rgba(199/255,199/255,199/255,1)
     property color disableColor: FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(253/255,253/255,253/255,1)
     property real size: 18
-    property color textColor: {
+    property alias textColor: btn_text.textColor
-        if(FluTheme.dark){
-            if(!enabled){
-                return Qt.rgba(130/255,130/255,130/255,1)
-            }
-            return Qt.rgba(1,1,1,1)
-        }else{
-            if(!enabled){
-                return Qt.rgba(161/255,161/255,161/255,1)
-            }
-            return Qt.rgba(0,0,0,1)
-        }
-    }
     property bool textRight: true
     property real textSpacing: 6
     property bool animationEnabled: FluTheme.animationEnabled
@@ -139,7 +127,6 @@ Button {
             Layout.alignment: Qt.AlignVCenter
             visible: text !== ""
             font: control.font
-            color: control.textColor
         }
     }
 }

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

@@ -47,17 +47,6 @@ Button{
         implicitWidth: 326
         implicitHeight: 560
         closePolicy: Popup.CloseOnEscape
-        onClosed: {
-            text_box_r.focus = false;
-            text_box_g.focus = false;
-            text_box_b.focus = false;
-            text_box_a.focus = false;
-            text_box_color.focus = false;
-        }
-        onOpened: {
-            layout_color_hue.updateColorText(current);
-            text_box_color.textEdited();
-        }
         Rectangle{
             id:layout_actions
             width: parent.width
@@ -159,9 +148,7 @@ Button{
                             if(color.a===1){
                                 colorString = "FF"+colorString
                             }
-                            if (!text_box_color.activeFocus) {
+                            text_box_color.text = colorString.toUpperCase()
-                                text_box_color.text = colorString.toUpperCase();
-                            }
                         }
                         property color blackColor: {
                             var c = whiteColor
@@ -292,11 +279,6 @@ Button{
                         preventStealing: true
                         function handleMouse(mouse) {
                             if (mouse.buttons & Qt.LeftButton) {
-                                text_box_r.focus = false;
-                                text_box_g.focus = false;
-                                text_box_b.focus = false;
-                                text_box_a.focus = false;
-                                text_box_color.focus = false;
                                 pickerCursor.x = Math.max(0,Math.min(mouse.x - colorHandleRadius,width-2*colorHandleRadius));
                                 pickerCursor.y = Math.max(0,Math.min(mouse.y - colorHandleRadius,height-2*colorHandleRadius));
                             }
@@ -387,11 +369,6 @@ Button{
                             preventStealing: true
                             function handleMouse(mouse) {
                                 if (mouse.buttons & Qt.LeftButton) {
-                                    text_box_r.focus = false;
-                                    text_box_g.focus = false;
-                                    text_box_b.focus = false;
-                                    text_box_a.focus = false;
-                                    text_box_color.focus = false;
                                     blackCursor.x = Math.max(0,Math.min(mouse.x - 6,width-2*6));
                                     blackCursor.y = 0
                                 }
@@ -461,11 +438,6 @@ Button{
                             preventStealing: true
                             function handleMouse(mouse) {
                                 if (mouse.buttons & Qt.LeftButton) {
-                                    text_box_r.focus = false;
-                                    text_box_g.focus = false;
-                                    text_box_b.focus = false;
-                                    text_box_a.focus = false;
-                                    text_box_color.focus = false;
                                     opacityCursor.x = Math.max(0,Math.min(mouse.x - 6,width-2*6));
                                     opacityCursor.y = 0
                                 }
@@ -500,7 +472,7 @@ Button{
                             id:text_box_color
                             width: 136
                             validator: RegularExpressionValidator {
-                                regularExpression: /^[0-9A-Fa-f]{8}$/
+                                regularExpression: /^[0-9A-F]{8}$/
                             }
                             anchors{
                                 right: parent.right
@@ -523,11 +495,6 @@ Button{
                                                 parseInt(colorString.substring(6, 8), 16) / 255,
                                                 parseInt(colorString.substring(0, 2), 16) / 255)
                                     layout_color_hue.colorValue = c
-                                    layout_color_hue.updateColorText(c);
-                                    text_box_r.textEdited();
-                                    text_box_g.textEdited();
-                                    text_box_b.textEdited();
-                                    text_box_a.textEdited();
                                 }
                             }
                         }

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

@@ -107,7 +107,7 @@ T.ComboBox {
         y: control.height
         width: control.width
         height: Math.min(contentItem.implicitHeight, control.Window.height - topMargin - bottomMargin)
-        topMargin: 32
+        topMargin: 6
         bottomMargin: 6
         modal: true
         contentItem: ListView {

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

@@ -41,7 +41,7 @@ FluPopup {
             FluText{
                 id:text_message
                 font: FluTextStyle.Body
-                wrapMode: Text.WordWrap
+                wrapMode: Text.WrapAnywhere
                 text:message
                 width: parent.width
                 topPadding: 4
@@ -67,7 +67,7 @@ FluPopup {
                 topPadding: 20
                 leftPadding: 20
                 rightPadding: 20
-                wrapMode: Text.WordWrap
+                wrapMode: Text.WrapAnywhere
             }
             FluLoader{
                 sourceComponent: com_message

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

@@ -3,19 +3,7 @@ import QtQuick.Controls 2.15
 import FluentUI 1.0
 
 TextEdit {
-    property color textColor: {
+    property color textColor: FluTheme.dark ? FluColors.White : FluColors.Grey220
-        if(FluTheme.dark){
-            if(!enabled){
-                return Qt.rgba(130/255,130/255,130/255,1)
-            }
-            return Qt.rgba(1,1,1,1)
-        }else{
-            if(!enabled){
-                return Qt.rgba(161/255,161/255,161/255,1)
-            }
-            return Qt.rgba(0,0,0,1)
-        }
-    }
     id:control
     color: textColor
     readOnly: true

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

@@ -5,8 +5,6 @@ import FluentUI 1.0
 
 Item {
     property string  headerText: ""
-    property int headerHeight : 45
-    property Component headerDelegate: com_header
     property bool expand: false
     property int contentHeight : 300
     default property alias content: container.data
@@ -23,23 +21,10 @@ Item {
         }
     }
     clip: true
-    Component {
-        id: com_header
-        Item {
-            FluText {
-                text: control.headerText
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                    left: parent.left
-                    leftMargin: 15
-                }
-            }
-        }
-    }
     Rectangle{
         id:layout_header
         width: parent.width
-        height: control.headerHeight
+        height: 45
         radius: 4
         border.color: FluTheme.dividerColor
         color: {
@@ -56,17 +41,15 @@ Item {
                 d.toggle()
             }
         }
-        FluLoader {
+        FluText{
-            anchors {
+            text: headerText
-                top: parent.top
+            anchors{
-                bottom: parent.bottom
+                verticalCenter: parent.verticalCenter
                 left: parent.left
-                right: btn_toggle.left
+                leftMargin: 15
             }
-            sourceComponent: control.headerDelegate
         }
         FluIconButton{
-            id: btn_toggle
             anchors{
                 verticalCenter: parent.verticalCenter
                 right: parent.right

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

@@ -5,19 +5,7 @@ import FluentUI 1.0
 Text {
     property int iconSource
     property int iconSize: 20
-    property color iconColor: {
+    property color iconColor: FluTheme.dark ? "#FFFFFF" : "#000000"
-        if(FluTheme.dark){
-            if(!enabled){
-                return Qt.rgba(130/255,130/255,130/255,1)
-            }
-            return Qt.rgba(1,1,1,1)
-        }else{
-            if(!enabled){
-                return Qt.rgba(161/255,161/255,161/255,1)
-            }
-            return Qt.rgba(0,0,0,1)
-        }
-    }
     id:control
     font.family: font_loader.name
     font.pixelSize: iconSize

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

@@ -37,19 +37,7 @@ Button {
             return Qt.rgba(0,0,0,1)
         }
     }
-    property color textColor: {
+    property color textColor: FluTheme.fontPrimaryColor
-        if(FluTheme.dark){
-            if(!enabled){
-                return Qt.rgba(130/255,130/255,130/255,1)
-            }
-            return Qt.rgba(1,1,1,1)
-        }else{
-            if(!enabled){
-                return Qt.rgba(161/255,161/255,161/255,1)
-            }
-            return Qt.rgba(0,0,0,1)
-        }
-    }
     Accessible.role: Accessible.Button
     Accessible.name: control.text
     Accessible.description: contentDescription

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

@@ -190,13 +190,13 @@ FluObject {
                     spacing: 5
                     FluText{
                         text:_super.text
-                        wrapMode: Text.WordWrap
+                        wrapMode: Text.WrapAnywhere
                         width: Math.min(implicitWidth,mcontrol.maxWidth)
                     }
                     FluText{
                         text: _super.moremsg
                         visible: _super.moremsg
-                        wrapMode : Text.WordWrap
+                        wrapMode : Text.WrapAnywhere
                         textColor: FluColors.Grey120
                         width: Math.min(implicitWidth,mcontrol.maxWidth)
                     }

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

@@ -20,7 +20,7 @@ TextArea{
         return normalColor
     }
     font:FluTextStyle.Body
-    wrapMode: Text.WordWrap
+    wrapMode: Text.WrapAnywhere
     padding: 8
     leftPadding: padding+4
     renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering

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

@@ -1313,7 +1313,7 @@ Item {
             d.stackItems = d.stackItems.concat(nav_list.model[nav_list.currentIndex])
         }
         function noStackPush(){
-            if(loader_content.source.toString() === url && Object.keys(argument).length === 0){
+            if(loader_content.source.toString() === url){
                 return
             }
             loader_content.setSource(url,argument)

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

@@ -5,9 +5,8 @@ import FluentUI 1.0
 Page {
     default property alias content: d.children
     property alias currentIndex: nav_list.currentIndex
-    property color textHighlightColor: FluTheme.dark ? FluColors.Grey10 : FluColors.Black
     property color textNormalColor: FluTheme.dark ? FluColors.Grey120 : FluColors.Grey120
-    property color textHoverColor: FluTheme.dark ? FluColors.Grey80 : FluColors.Grey150
+    property color textHoverColor: FluTheme.dark ? FluColors.Grey10 : FluColors.Black
     property int textSpacing: 10
     property int headerSpacing: 20
     property int headerHeight: 40
@@ -31,15 +30,21 @@ Page {
         interactive: false
         orientation: ListView.Horizontal
         highlightMoveDuration: FluTheme.animationEnabled ? 167 : 0
-        highlightResizeDuration: FluTheme.animationEnabled ? 167 : 0
         highlight: Item{
             clip: true
             Rectangle{
                 height: 3
                 radius: 1.5
                 color: FluTheme.primaryColor
-                width: nav_list.currentItem.width
+                width: nav_list.currentItem ? nav_list.currentItem.width : 0
                 y:d.tabY
+                Behavior on width {
+                    enabled: FluTheme.animationEnabled
+                    NumberAnimation{
+                        duration: 167
+                        easing.type: Easing.OutCubic
+                    }
+                }
             }
         }
         delegate: Button{
@@ -61,13 +66,9 @@ Page {
                     anchors.centerIn: parent
                     font: control.font
                     color: {
-                        if(nav_list.currentIndex === index) {
+                        if(item_button.hovered)
-                            return textHighlightColor;
+                            return textHoverColor
-                        }
+                        return textNormalColor
-                        if (item_button.hovered) {
-                            return textHoverColor;
-                        } 
-                        return textNormalColor;
                     }
                 }
             }

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

@@ -14,6 +14,13 @@ 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
@@ -34,20 +41,13 @@ ProgressBar{
             height: parent.height
             radius: d._radius
             color: control.color
-            SequentialAnimation on x {
+            PropertyAnimation on x {
-                id: animator_x
+                id:animator_x
                 running: control.indeterminate && control.visible
+                from: -rect_progress.width
+                to:control.width+rect_progress.width
                 loops: Animation.Infinite
-                onRunningChanged: {
+                duration: control.duration
-                    if(!running){
-                        rect_progress.x = 0
-                    }
-                }
-                PropertyAnimation {
-                    from: -rect_progress.width
-                    to: control.width + rect_progress.width
-                    duration: control.duration
-                }
             }
         }
     }

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

@@ -11,19 +11,7 @@ Button {
     property color normalColor: FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(1,1,1,1)
     property color hoverColor: checked ? FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(1,1,1,1) : FluTheme.dark ? Qt.rgba(43/255,43/255,43/255,1) : Qt.rgba(222/255,222/255,222/255,1)
     property color disableColor: checked ? FluTheme.dark ? Qt.rgba(159/255,159/255,159/255,1) : Qt.rgba(159/255,159/255,159/255,1)  : FluTheme.dark ? Qt.rgba(43/255,43/255,43/255,1) : Qt.rgba(222/255,222/255,222/255,1)
-    property color textColor: {
+    property alias textColor: btn_text.textColor
-        if(FluTheme.dark){
-            if(!enabled){
-                return Qt.rgba(130/255,130/255,130/255,1)
-            }
-            return Qt.rgba(1,1,1,1)
-        }else{
-            if(!enabled){
-                return Qt.rgba(161/255,161/255,161/255,1)
-            }
-            return Qt.rgba(0,0,0,1)
-        }
-    }
     property real size: 18
     property bool textRight: true
     property real textSpacing: 6
@@ -106,7 +94,6 @@ Button {
             Layout.alignment: Qt.AlignVCenter
             visible: text !== ""
             font: control.font
-            color: control.textColor
         }
     }
 }

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

@@ -5,11 +5,8 @@ import QtQuick.Controls 2.15
 import FluentUI 1.0
 
 FluPage {
-    property bool autoResetScroll: false
     default property alias content: container.data
-
     Flickable{
-        id: flickable
         clip: true
         anchors.fill: parent
         ScrollBar.vertical: FluScrollBar {}
@@ -20,14 +17,4 @@ FluPage {
             width: parent.width
         }
     }
-
-    function resetScroll() {
-        flickable.contentY = 0;
-    }
-
-    StackView.onActivated: {
-        if (autoResetScroll) {
-            resetScroll(); // Call this function to reset the scroll position to the top
-        }
-    }
 }

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

@@ -5,7 +5,7 @@ import FluentUI 1.0
 Text {
     property color textColor: FluTheme.fontPrimaryColor
     id:text
-    color: enabled ? textColor : (FluTheme.dark ? Qt.rgba(131/255,131/255,131/255,1) : Qt.rgba(160/255,160/255,160/255,1))
+    color: textColor
     renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
     font: FluTextStyle.Body
 }

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

@@ -335,7 +335,7 @@ FluButton {
                             if (hours === "12") {
                                 hours24 = (period === control.amText) ? 0 : 12;
                             } else {
-                                hours24 = (period === control.pmText) ? hours24 + 12 : hours24;
+                                hours24 = (period === control.pmText) ? hours24 : hours24 + 12;
                             }
                         }
                         date.setHours(hours24);

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

@@ -98,7 +98,7 @@ Item{
     Component{
         id:com_lable
         FluText{
-            wrapMode: Text.WordWrap
+            wrapMode: Text.WrapAnywhere
             horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
             text: {
                 if(modelData.lable){
@@ -113,7 +113,7 @@ Item{
     Component{
         id:com_text
         FluText{
-            wrapMode: Text.WordWrap
+            wrapMode: Text.WrapAnywhere
             horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
             text: modelData.text
             textFormat: Text.RichText

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

@@ -18,19 +18,7 @@ Button {
     property color dotDisableColor: FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(150/255,150/255,150/255,1)
     property real textSpacing: 6
     property bool textRight: true
-    property color textColor: {
+    property alias textColor: btn_text.textColor
-        if(FluTheme.dark){
-            if(!enabled){
-                return Qt.rgba(130/255,130/255,130/255,1)
-            }
-            return Qt.rgba(1,1,1,1)
-        }else{
-            if(!enabled){
-                return Qt.rgba(161/255,161/255,161/255,1)
-            }
-            return Qt.rgba(0,0,0,1)
-        }
-    }
     property var clickListener : function(){
         checked = !checked
     }
@@ -127,7 +115,6 @@ Button {
             text: control.text
             Layout.alignment: Qt.AlignVCenter
             visible: text !== ""
-            color: control.textColor
         }
     }
 }

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

@@ -175,7 +175,7 @@ Popup{
         FluText{
             id: text_desc
             font: FluTextStyle.Body
-            wrapMode: Text.WordWrap
+            wrapMode: Text.WrapAnywhere
             maximumLineCount: 4
             elide: Text.ElideRight
             text: {

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

@@ -474,7 +474,6 @@ Rectangle {
                     }
                     return {}
                 }
-                active: rowModel !== undefined && rowModel !== null
                 sourceComponent: {
                     if(column === 0)
                         return com_column

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

@@ -13,11 +13,6 @@ Window {
     property bool fixSize: false
     property Component loadingItem: com_loading
     property bool fitsAppBarWindows: false
-    property var tintOpacity: FluTheme.dark ? 0.80 : 0.75
-    property int blurRadius: 60
-    property alias effect: frameless.effect
-    readonly property alias effective: frameless.effective
-    readonly property alias availableEffects: frameless.availableEffects
     property Item appBar: FluAppBar {
         title: window.title
         height: 30
@@ -29,15 +24,6 @@ Window {
         icon: window.windowIcon
     }
     property color backgroundColor: {
-        if(frameless.effective && active){
-            var backcolor
-            if(frameless.effect==="dwm-blur"){
-                backcolor = FluTools.withOpacity(FluTheme.windowActiveBackgroundColor, window.tintOpacity)
-            }else{
-                backcolor =  "transparent"
-            }
-            return backcolor
-        }
         if(active){
             return FluTheme.windowActiveBackgroundColor
         }
@@ -114,8 +100,6 @@ Window {
         fixSize: window.fixSize
         topmost: window.stayTop
         disabled: FluApp.useSystemAppBar
-        isDarkMode: FluTheme.dark
-        useSystemEffect: !FluTheme.blurBehindWindowEnabled
         Component.onCompleted: {
             frameless.setHitTestVisible(appBar.layoutMacosButtons)
             frameless.setHitTestVisible(appBar.layoutStandardbuttons)
@@ -123,11 +107,6 @@ Window {
         Component.onDestruction: {
             frameless.onDestruction()
         }
-        onEffectiveChanged: {
-            if(effective){
-                FluTheme.blurBehindWindowEnabled = false
-            }
-        }
     }
     Component{
         id:com_background
@@ -183,8 +162,8 @@ Window {
             FluAcrylic{
                 anchors.fill: parent
                 target: img_back
-                tintOpacity: window.tintOpacity
+                tintOpacity: FluTheme.dark ? 0.80 : 0.75
-                blurRadius: window.blurRadius
+                blurRadius: 64
                 visible: window.active && FluTheme.blurBehindWindowEnabled
                 tintColor: FluTheme.dark ? Qt.rgba(0, 0, 0, 1)  : Qt.rgba(1, 1, 1, 1)
                 targetRect: Qt.rect(window.x-window.screen.virtualX,window.y-window.screen.virtualY,window.width,window.height)

src/Qt5/imports/FluentUI/plugins.qmltypes

@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable -noinstantiate FluentUI 1.0 E:/develop/QtCode/opensource/FluentUI/build/Desktop_Qt_5_15_2_MinGW_64_bit-Release/src'
+// 'qmlplugindump -nonrelocatable FluentUI 1.0 D:/QtProjects/build-FluentUI-Desktop_Qt_5_15_2_MSVC2019_64bit-Release/src'
 
 Module {
     dependencies: ["QtQuick 2.0"]
@@ -150,11 +150,6 @@ Module {
         Property { name: "topmost"; type: "bool" }
         Property { name: "disabled"; type: "bool" }
         Property { name: "fixSize"; type: "bool" }
-        Property { name: "effect"; type: "string" }
-        Property { name: "effective"; type: "bool"; isReadonly: true }
-        Property { name: "availableEffects"; type: "QStringList"; isReadonly: true }
-        Property { name: "isDarkMode"; type: "bool" }
-        Property { name: "useSystemEffect"; type: "bool" }
         Method { name: "showFullScreen" }
         Method { name: "showMaximized" }
         Method { name: "showMinimized" }
@@ -674,12 +669,12 @@ Module {
         }
     }
     Component {
-        name: "FluentIcons"
+        name: "Fluent_Icons"
         exports: ["FluentUI/FluentIcons 1.0"]
         isCreatable: false
         exportMetaObjectRevisions: [0]
         Enum {
-            name: "Type"
+            name: "Fluent_IconType"
             values: {
                 "GlobalNavButton": 59136,
                 "Wifi": 59137,
@@ -2454,240 +2449,6 @@ Module {
         Method { name: "clear" }
         Method { name: "invalidate" }
     }
-    Component {
-        name: "QmlQCustomPlot::Axis"
-        prototype: "QObject"
-        exports: ["FluentUI/Axis 1.0"]
-        isCreatable: false
-        exportMetaObjectRevisions: [0]
-        Enum {
-            name: "TickerType"
-            values: {
-                "Fixed": 0,
-                "Log": 1,
-                "Pi": 2,
-                "Text": 3,
-                "DateTime": 4,
-                "Time": 5
-            }
-        }
-        Property { name: "visible"; type: "bool" }
-        Property { name: "label"; type: "string" }
-        Property { name: "upper"; type: "float" }
-        Property { name: "lower"; type: "float" }
-        Property { name: "grid"; type: "QmlQCustomPlot::Grid"; isReadonly: true; isPointer: true }
-        Property { name: "ticker"; type: "QmlQCustomPlot::Ticker"; isReadonly: true; isPointer: true }
-        Signal {
-            name: "visibleChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "labelChanged"
-            Parameter { type: "string" }
-        }
-        Signal {
-            name: "upperChanged"
-            Parameter { type: "float" }
-        }
-        Signal {
-            name: "lowerChanged"
-            Parameter { type: "float" }
-        }
-        Signal {
-            name: "gridChanged"
-            Parameter { type: "QmlQCustomPlot::Grid"; isPointer: true }
-        }
-        Signal {
-            name: "tickerChanged"
-            Parameter { type: "QmlQCustomPlot::Ticker"; isPointer: true }
-        }
-        Method {
-            name: "setTickerType"
-            Parameter { name: "type"; type: "TickerType" }
-        }
-        Method {
-            name: "setRange"
-            Parameter { name: "position"; type: "float" }
-            Parameter { name: "size"; type: "float" }
-            Parameter { name: "align"; type: "Qt::AlignmentFlag" }
-        }
-        Method {
-            name: "setRange"
-            Parameter { name: "lower"; type: "float" }
-            Parameter { name: "upper"; type: "float" }
-        }
-    }
-    Component {
-        name: "QmlQCustomPlot::BasePlot"
-        defaultProperty: "data"
-        prototype: "QQuickPaintedItem"
-        exports: ["FluentUI/BasePlot 1.0"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "backgroundColor"; type: "QColor" }
-        Property { name: "xAxis"; type: "QmlQCustomPlot::Axis"; isReadonly: true; isPointer: true }
-        Property { name: "x1Axis"; type: "QmlQCustomPlot::Axis"; isReadonly: true; isPointer: true }
-        Property { name: "yAxis"; type: "QmlQCustomPlot::Axis"; isReadonly: true; isPointer: true }
-        Property { name: "y1Axis"; type: "QmlQCustomPlot::Axis"; isReadonly: true; isPointer: true }
-        Property { name: "graphs"; type: "QVariantMap"; isReadonly: true }
-        Signal {
-            name: "backgroundColorChanged"
-            Parameter { type: "QColor" }
-        }
-        Signal {
-            name: "xAxisChanged"
-            Parameter { type: "QmlQCustomPlot::Axis"; isPointer: true }
-        }
-        Signal {
-            name: "x1AxisChanged"
-            Parameter { type: "QmlQCustomPlot::Axis"; isPointer: true }
-        }
-        Signal {
-            name: "yAxisChanged"
-            Parameter { type: "QmlQCustomPlot::Axis"; isPointer: true }
-        }
-        Signal {
-            name: "y1AxisChanged"
-            Parameter { type: "QmlQCustomPlot::Axis"; isPointer: true }
-        }
-        Method {
-            name: "addGraph"
-            Parameter { name: "key"; type: "string" }
-        }
-        Method {
-            name: "removeGraph"
-            Parameter { name: "key"; type: "string" }
-        }
-        Method {
-            name: "rescaleAxes"
-            Parameter { name: "onlyVisiblePlottables"; type: "bool" }
-        }
-        Method { name: "rescaleAxes" }
-    }
-    Component {
-        name: "QmlQCustomPlot::Grid"
-        prototype: "QObject"
-        exports: ["FluentUI/PlotGrid 1.0"]
-        isCreatable: false
-        exportMetaObjectRevisions: [0]
-        Enum {
-            name: "LineType"
-            values: {
-                "NoPen": 0,
-                "SolidLine": 1,
-                "DashLine": 2,
-                "DotLine": 3,
-                "DashDotLine": 4,
-                "DashDotDotLine": 5
-            }
-        }
-        Property { name: "visible"; type: "bool" }
-        Property { name: "subVisible"; type: "bool" }
-        Property { name: "lineWidth"; type: "int" }
-        Property { name: "lineColor"; type: "QColor" }
-        Property { name: "lineType"; type: "LineType" }
-        Property { name: "subLineWidth"; type: "int" }
-        Property { name: "subLineColor"; type: "QColor" }
-        Property { name: "subLineType"; type: "LineType" }
-        Signal {
-            name: "visibleChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "subVisibleChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "lineWidthChanged"
-            Parameter { type: "int" }
-        }
-        Signal {
-            name: "lineColorChanged"
-            Parameter { type: "QColor" }
-        }
-        Signal {
-            name: "lineTypeChanged"
-            Parameter { type: "LineType" }
-        }
-        Signal {
-            name: "subLineWidthChanged"
-            Parameter { type: "int" }
-        }
-        Signal {
-            name: "subLineColorChanged"
-            Parameter { type: "QColor" }
-        }
-        Signal {
-            name: "subLineTypeChanged"
-            Parameter { type: "LineType" }
-        }
-    }
-    Component {
-        name: "QmlQCustomPlot::Ticker"
-        prototype: "QObject"
-        exports: ["FluentUI/Ticker 1.0"]
-        isCreatable: false
-        exportMetaObjectRevisions: [0]
-        Property { name: "ticks"; type: "bool" }
-        Property { name: "subTicks"; type: "bool" }
-        Property { name: "tickCount"; type: "int" }
-        Property { name: "baseWidth"; type: "int" }
-        Property { name: "baseColor"; type: "QColor" }
-        Property { name: "tickColor"; type: "QColor" }
-        Property { name: "subTickColor"; type: "QColor" }
-        Signal {
-            name: "ticksChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "subTicksChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "tickCountChanged"
-            Parameter { type: "int" }
-        }
-        Signal {
-            name: "baseWidthChanged"
-            Parameter { type: "int" }
-        }
-        Signal {
-            name: "baseColorChanged"
-            Parameter { type: "QColor" }
-        }
-        Signal {
-            name: "tickColorChanged"
-            Parameter { type: "QColor" }
-        }
-        Signal {
-            name: "subTickColorChanged"
-            Parameter { type: "QColor" }
-        }
-    }
-    Component {
-        name: "QmlQCustomPlot::TimePlot"
-        defaultProperty: "data"
-        prototype: "QmlQCustomPlot::BasePlot"
-        exports: ["FluentUI/TimePlot 1.0"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "plotTimeRangeInMilliseconds"; type: "int" }
-        Signal {
-            name: "plotTimeRangeInMillisecondsChanged"
-            Parameter { type: "int" }
-        }
-        Method {
-            name: "setTimeFormat"
-            Parameter { name: "format"; type: "string" }
-        }
-        Method {
-            name: "addCurrentTimeValue"
-            Parameter { name: "name"; type: "string" }
-            Parameter { name: "value"; type: "double" }
-        }
-        Method {
-            name: "addCurrentTimeValues"
-            Parameter { name: "values"; type: "QVariantMap" }
-        }
-    }
     Component {
         prototype: "QQuickItem"
         name: "FluentUI/FluAcrylic 1.0"
@@ -2746,37 +2507,37 @@ Module {
         Property { name: "darkClickListener"; type: "QVariant" }
         Property {
             name: "buttonStayTop"
-            type: "FluIconButton_QMLTYPE_19"
+            type: "FluIconButton_QMLTYPE_18"
             isReadonly: true
             isPointer: true
         }
         Property {
             name: "buttonMinimize"
-            type: "FluIconButton_QMLTYPE_19"
+            type: "FluIconButton_QMLTYPE_18"
             isReadonly: true
             isPointer: true
         }
         Property {
             name: "buttonMaximize"
-            type: "FluIconButton_QMLTYPE_19"
+            type: "FluIconButton_QMLTYPE_18"
             isReadonly: true
             isPointer: true
         }
         Property {
             name: "buttonClose"
-            type: "FluIconButton_QMLTYPE_19"
+            type: "FluIconButton_QMLTYPE_18"
             isReadonly: true
             isPointer: true
         }
         Property {
             name: "buttonDark"
-            type: "FluIconButton_QMLTYPE_19"
+            type: "FluIconButton_QMLTYPE_18"
             isReadonly: true
             isPointer: true
         }
         Property {
             name: "layoutMacosButtons"
-            type: "FluLoader_QMLTYPE_14"
+            type: "FluLoader_QMLTYPE_16"
             isReadonly: true
             isPointer: true
         }
@@ -2898,7 +2659,6 @@ Module {
         isComposite: true
         defaultProperty: "data"
         Property { name: "autoPlay"; type: "bool" }
-        Property { name: "orientation"; type: "int" }
         Property { name: "loopTime"; type: "int" }
         Property { name: "model"; type: "QVariant" }
         Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
@@ -2956,12 +2716,12 @@ Module {
         Property { name: "checkedDisableColor"; type: "QColor" }
         Property { name: "disableColor"; type: "QColor" }
         Property { name: "size"; type: "double" }
-        Property { name: "textColor"; type: "QColor" }
         Property { name: "textRight"; type: "bool" }
         Property { name: "textSpacing"; type: "double" }
         Property { name: "animationEnabled"; type: "bool" }
         Property { name: "clickListener"; type: "QVariant" }
         Property { name: "indeterminate"; type: "bool" }
+        Property { name: "textColor"; type: "QColor" }
     }
     Component {
         prototype: "FluRectangle"
@@ -3190,8 +2950,6 @@ Module {
         isComposite: true
         defaultProperty: "content"
         Property { name: "headerText"; type: "string" }
-        Property { name: "headerHeight"; type: "int" }
-        Property { name: "headerDelegate"; type: "QQmlComponent"; isPointer: true }
         Property { name: "expand"; type: "bool" }
         Property { name: "contentHeight"; type: "int" }
         Property { name: "content"; type: "QObject"; isList: true; isReadonly: true }
@@ -3472,15 +3230,15 @@ Module {
         defaultProperty: "data"
         Property { name: "logo"; type: "QUrl" }
         Property { name: "title"; type: "string" }
-        Property { name: "items"; type: "FluObject_QMLTYPE_182"; isPointer: true }
+        Property { name: "items"; type: "FluObject_QMLTYPE_164"; isPointer: true }
-        Property { name: "footerItems"; type: "FluObject_QMLTYPE_182"; isPointer: true }
+        Property { name: "footerItems"; type: "FluObject_QMLTYPE_164"; isPointer: true }
         Property { name: "displayMode"; type: "int" }
         Property { name: "autoSuggestBox"; type: "QQmlComponent"; isPointer: true }
         Property { name: "actionItem"; type: "QQmlComponent"; isPointer: true }
         Property { name: "topPadding"; type: "int" }
         Property { name: "pageMode"; type: "int" }
-        Property { name: "navItemRightMenu"; type: "FluMenu_QMLTYPE_47"; isPointer: true }
+        Property { name: "navItemRightMenu"; type: "FluMenu_QMLTYPE_36"; isPointer: true }
-        Property { name: "navItemExpanderRightMenu"; type: "FluMenu_QMLTYPE_47"; isPointer: true }
+        Property { name: "navItemExpanderRightMenu"; type: "FluMenu_QMLTYPE_36"; isPointer: true }
         Property { name: "navCompactWidth"; type: "int" }
         Property { name: "navTopMargin"; type: "int" }
         Property { name: "cellHeight"; type: "int" }
@@ -3488,13 +3246,13 @@ Module {
         Property { name: "hideNavAppBar"; type: "bool" }
         Property {
             name: "buttonMenu"
-            type: "FluIconButton_QMLTYPE_19"
+            type: "FluIconButton_QMLTYPE_18"
             isReadonly: true
             isPointer: true
         }
         Property {
             name: "buttonBack"
-            type: "FluIconButton_QMLTYPE_19"
+            type: "FluIconButton_QMLTYPE_18"
             isReadonly: true
             isPointer: true
         }
@@ -3679,7 +3437,6 @@ Module {
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "content"
-        Property { name: "textHighlightColor"; type: "QColor" }
         Property { name: "textNormalColor"; type: "QColor" }
         Property { name: "textHoverColor"; type: "QColor" }
         Property { name: "textSpacing"; type: "int" }
@@ -3776,11 +3533,11 @@ Module {
         Property { name: "normalColor"; type: "QColor" }
         Property { name: "hoverColor"; type: "QColor" }
         Property { name: "disableColor"; type: "QColor" }
-        Property { name: "textColor"; type: "QColor" }
         Property { name: "size"; type: "double" }
         Property { name: "textRight"; type: "bool" }
         Property { name: "textSpacing"; type: "double" }
         Property { name: "clickListener"; type: "QVariant" }
+        Property { name: "textColor"; type: "QColor" }
     }
     Component {
         prototype: "QQuickItem"
@@ -3863,7 +3620,7 @@ Module {
         Method {
             name: "removeWindow"
             type: "QVariant"
-            Parameter { name: "win"; type: "QVariant" }
+            Parameter { name: "window"; type: "QVariant" }
         }
         Method {
             name: "exit"
@@ -3903,9 +3660,7 @@ Module {
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "content"
-        Property { name: "autoResetScroll"; type: "bool" }
         Property { name: "content"; type: "QObject"; isList: true; isReadonly: true }
-        Method { name: "resetScroll"; type: "QVariant" }
         Property { name: "launchMode"; type: "int" }
         Property { name: "animationEnabled"; type: "bool" }
         Property { name: "url"; type: "string" }
@@ -4300,8 +4055,8 @@ Module {
         Property { name: "dotDisableColor"; type: "QColor" }
         Property { name: "textSpacing"; type: "double" }
         Property { name: "textRight"; type: "bool" }
-        Property { name: "textColor"; type: "QColor" }
         Property { name: "clickListener"; type: "QVariant" }
+        Property { name: "textColor"; type: "QColor" }
     }
     Component {
         prototype: "QQuickToolTip"
@@ -4383,8 +4138,6 @@ Module {
         Property { name: "fixSize"; type: "bool" }
         Property { name: "loadingItem"; type: "QQmlComponent"; isPointer: true }
         Property { name: "fitsAppBarWindows"; type: "bool" }
-        Property { name: "tintOpacity"; type: "QVariant" }
-        Property { name: "blurRadius"; type: "int" }
         Property { name: "appBar"; type: "QQuickItem"; isPointer: true }
         Property { name: "backgroundColor"; type: "QColor" }
         Property { name: "stayTop"; type: "bool" }
@@ -4398,7 +4151,6 @@ Module {
         Property { name: "autoCenter"; type: "bool" }
         Property { name: "autoDestroy"; type: "bool" }
         Property { name: "useSystemAppBar"; type: "bool" }
-        Property { name: "__margins"; type: "int" }
         Property { name: "resizeBorderColor"; type: "QColor" }
         Property { name: "resizeBorderWidth"; type: "int" }
         Property { name: "closeListener"; type: "QVariant" }
@@ -4406,9 +4158,6 @@ Module {
         Property { name: "_route"; type: "string" }
         Property { name: "_hideShadow"; type: "bool" }
         Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "effect"; type: "string" }
-        Property { name: "effective"; type: "bool"; isReadonly: true }
-        Property { name: "availableEffects"; type: "QStringList"; isReadonly: true }
         Signal {
             name: "initArgument"
             Parameter { name: "argument"; type: "QVariant" }
@@ -4446,6 +4195,11 @@ Module {
         Method { name: "clearAllInfo"; type: "QVariant" }
         Method { name: "moveWindowToDesktopCenter"; type: "QVariant" }
         Method { name: "fixWindowSize"; type: "QVariant" }
+        Method {
+            name: "registerForWindowResult"
+            type: "QVariant"
+            Parameter { name: "path"; type: "QVariant" }
+        }
         Method {
             name: "setResult"
             type: "QVariant"
@@ -4465,8 +4219,6 @@ Module {
             type: "QVariant"
             Parameter { name: "val"; type: "QVariant" }
         }
-        Method { name: "deleteLater"; type: "QVariant" }
-        Method { name: "containerItem"; type: "QVariant" }
     }
     Component {
         prototype: "QQuickWindowQmlImpl"
@@ -4489,8 +4241,6 @@ Module {
         Property { name: "fixSize"; type: "bool" }
         Property { name: "loadingItem"; type: "QQmlComponent"; isPointer: true }
         Property { name: "fitsAppBarWindows"; type: "bool" }
-        Property { name: "tintOpacity"; type: "QVariant" }
-        Property { name: "blurRadius"; type: "int" }
         Property { name: "appBar"; type: "QQuickItem"; isPointer: true }
         Property { name: "backgroundColor"; type: "QColor" }
         Property { name: "stayTop"; type: "bool" }
@@ -4504,7 +4254,6 @@ Module {
         Property { name: "autoCenter"; type: "bool" }
         Property { name: "autoDestroy"; type: "bool" }
         Property { name: "useSystemAppBar"; type: "bool" }
-        Property { name: "__margins"; type: "int" }
         Property { name: "resizeBorderColor"; type: "QColor" }
         Property { name: "resizeBorderWidth"; type: "int" }
         Property { name: "closeListener"; type: "QVariant" }
@@ -4512,9 +4261,6 @@ Module {
         Property { name: "_route"; type: "string" }
         Property { name: "_hideShadow"; type: "bool" }
         Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "effect"; type: "string" }
-        Property { name: "effective"; type: "bool"; isReadonly: true }
-        Property { name: "availableEffects"; type: "QStringList"; isReadonly: true }
         Signal {
             name: "initArgument"
             Parameter { name: "argument"; type: "QVariant" }
@@ -4552,6 +4298,11 @@ Module {
         Method { name: "clearAllInfo"; type: "QVariant" }
         Method { name: "moveWindowToDesktopCenter"; type: "QVariant" }
         Method { name: "fixWindowSize"; type: "QVariant" }
+        Method {
+            name: "registerForWindowResult"
+            type: "QVariant"
+            Parameter { name: "path"; type: "QVariant" }
+        }
         Method {
             name: "setResult"
             type: "QVariant"
@@ -4571,8 +4322,6 @@ Module {
             type: "QVariant"
             Parameter { name: "val"; type: "QVariant" }
         }
-        Method { name: "deleteLater"; type: "QVariant" }
-        Method { name: "containerItem"; type: "QVariant" }
     }
     Component {
         prototype: "QQuickItem"

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

@@ -73,7 +73,7 @@ Rectangle{
         text:{
             if(count<100)
                 return count
-            return "100+"
+            return count+"+"
         }
     }
 }

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

@@ -4,7 +4,6 @@ import FluentUI
 
 Item {
     property bool autoPlay: true
-    property int orientation: Qt.Horizontal
     property int loopTime: 2000
     property var model
     property Component delegate
@@ -15,7 +14,7 @@ Item {
     property int indicatorMarginTop: 0
     property int indicatorMarginBottom: 20
     property int indicatorSpacing: 10
-    property alias indicatorAnchors: indicator_loader.anchors
+    property alias indicatorAnchors: layout_indicator.anchors
     property Component indicatorDelegate : com_indicator
     id:control
     width: 400
@@ -25,24 +24,13 @@ Item {
     }
     QtObject{
         id:d
-        property bool isManualMoving: false
+        property bool flagXChanged: true
         property bool isAnimEnable: control.autoPlay && list_view.count>3
-        onIsAnimEnableChanged: {
-            if(isAnimEnable){
-                timer_run.restart()
-            }else{
-                timer_run.stop()
-            }
-        }
         function setData(data){
-            if(!data || !Array.isArray(data)){
+            if(!data){
                 return
             }
             content_model.clear()
-            list_view.resetPos()
-            if(data.length === 0){
-                return
-            }
             content_model.append(data[data.length-1])
             content_model.append(data)
             content_model.append(data[0])
@@ -61,7 +49,7 @@ Item {
         clip: true
         boundsBehavior: ListView.StopAtBounds
         model:content_model
-        maximumFlickVelocity: 4 * (control.orientation === Qt.Vertical ? height : width)
+        maximumFlickVelocity: 4 * (list_view.orientation === Qt.Horizontal ? width : height)
         preferredHighlightBegin: 0
         preferredHighlightEnd: 0
         highlightMoveDuration: 0
@@ -75,7 +63,7 @@ Item {
                 d.setData(control.model)
             }
         }
-        orientation : control.orientation
+        orientation : ListView.Horizontal
         delegate: Item{
             id:item_control
             width: ListView.view.width
@@ -100,63 +88,31 @@ Item {
             }
         }
         onMovementEnded:{
-            d.isManualMoving = false
+            currentIndex = list_view.contentX/list_view.width
-            list_view.highlightMoveDuration = 0
+            if(currentIndex === 0){
-            if(control.orientation === Qt.Vertical){
+                currentIndex = list_view.count-2
-                currentIndex = (list_view.contentY - list_view.originY) / list_view.height
+            }else if(currentIndex === list_view.count-1){
-                if(currentIndex === 0){
+                currentIndex = 1
-                    currentIndex = list_view.count - 2
-                }else if(currentIndex === list_view.count - 1) {
-                    currentIndex = 1
-                }
-            } else {
-                currentIndex = (list_view.contentX - list_view.originX) / list_view.width
-                if(currentIndex === 0){
-                    currentIndex = list_view.count - 2
-                }else if(currentIndex === list_view.count - 1){
-                    currentIndex = 1
-                }
-            }
-            if(d.isAnimEnable){
-                timer_run.restart()
             }
+            d.flagXChanged = false
+            timer_run.restart()
         }
         onMovementStarted: {
-            d.isManualMoving = true
+            d.flagXChanged = true
             timer_run.stop()
         }
         onContentXChanged: {
-            if(d.isManualMoving && control.orientation === Qt.Horizontal){
+            if(d.flagXChanged){
-                const range = getPosRange(list_view.width, currentIndex)
+                var maxX = Math.min(list_view.width*(currentIndex+1),list_view.count*list_view.width)
-                if(contentX >= range.max){
+                var minY = Math.max(0,(list_view.width*(currentIndex-1)))
-                    contentX = range.max
+                if(contentX>=maxX){
+                    contentX = maxX
                 }
-                if(contentX <= range.min){
+                if(contentX<=minY){
-                    contentX = range.min
+                    contentX = minY
                 }
             }
         }
-        onContentYChanged: {
-            if(d.isManualMoving && control.orientation === Qt.Vertical){
-                const range = getPosRange(list_view.height, currentIndex)
-                if(contentY >= range.max){
-                    contentY = range.max
-                }
-                if(contentY <= range.min){
-                    contentY = range.min
-                }
-            }
-        }
-        function resetPos() {
-            contentX = 0
-            contentY = 0
-        }
-        function getPosRange(size, index) {
-            return {
-                "min": Math.max(0, size * (index - 1)),
-                "max": Math.min(size * (index + 1), list_view.count * size)
-            }
-        }
     }
     Component{
         id:com_indicator
@@ -181,9 +137,9 @@ Item {
             }
         }
     }
-
+    Row{
-    Loader{
+        id:layout_indicator
-        id: indicator_loader
+        spacing: control.indicatorSpacing
         anchors{
             horizontalCenter:(indicatorGravity & Qt.AlignHCenter) ? parent.horizontalCenter : undefined
             verticalCenter: (indicatorGravity & Qt.AlignVCenter) ? parent.verticalCenter : undefined
@@ -196,66 +152,28 @@ Item {
             rightMargin: control.indicatorMarginBottom
             topMargin: control.indicatorMarginBottom
         }
-        active: showIndicator
+        visible: showIndicator
-        sourceComponent: control.orientation === Qt.Vertical ? column_indicator : row_indicator
+        Repeater{
-    }
+            id:repeater_indicator
-
+            model: list_view.count
-    Component{
+            FluLoader{
-        id: row_indicator
+                property int displayIndex: {
-        Row{
+                    if(index === 0)
-            id:layout_indicator
+                        return list_view.count-3
-            spacing: control.indicatorSpacing
+                    if(index === list_view.count-1)
-            Repeater{
+                        return 0
-                id:repeater_indicator
+                    return index-1
-                model: list_view.count
+                }
-                FluLoader{
+                property int realIndex: index
-                    property int displayIndex: {
+                property bool checked: list_view.currentIndex === index
-                        if(index === 0)
+                sourceComponent: {
-                            return list_view.count-3
+                    if(index===0 || index===list_view.count-1)
-                        if(index === list_view.count-1)
+                        return undefined
-                            return 0
+                    return control.indicatorDelegate
-                        return index-1
-                    }
-                    property int realIndex: index
-                    property bool checked: list_view.currentIndex === index
-                    sourceComponent: {
-                        if(index===0 || index===list_view.count-1)
-                            return undefined
-                        return control.indicatorDelegate
-                    }
                 }
             }
         }
     }
-
-    Component{
-        id: column_indicator
-        Column{
-            id:layout_indicator
-            spacing: control.indicatorSpacing
-            Repeater{
-                id:repeater_indicator
-                model: list_view.count
-                FluLoader{
-                    property int displayIndex: {
-                        if(index === 0)
-                            return list_view.count-3
-                        if(index === list_view.count-1)
-                            return 0
-                        return index-1
-                    }
-                    property int realIndex: index
-                    property bool checked: list_view.currentIndex === index
-                    sourceComponent: {
-                        if(index===0 || index===list_view.count-1)
-                            return undefined
-                        return control.indicatorDelegate
-                    }
-                }
-            }
-        }
-    }
-
     Timer{
         id:timer_anim
         interval: 250
@@ -277,10 +195,10 @@ Item {
         }
     }
     function changedIndex(index){
-        d.isManualMoving = true
+        d.flagXChanged = true
         timer_run.stop()
         list_view.currentIndex = index
-        d.isManualMoving = false
+        d.flagXChanged = false
         if(d.isAnimEnable){
             timer_run.restart()
         }

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

@@ -14,9 +14,7 @@ Canvas {
     function animateToNewData()
     {
         chartAnimationProgress = 0.1;
-        if (d.jsChart) {
+        d.jsChart.update();
-            d.jsChart.update();
-        }
         chartAnimator.restart();
     }
     QtObject{

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

@@ -20,19 +20,7 @@ Button {
     property color checkedDisableColor: FluTheme.dark ? Qt.rgba(82/255,82/255,82/255,1) : Qt.rgba(199/255,199/255,199/255,1)
     property color disableColor: FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(253/255,253/255,253/255,1)
     property real size: 18
-    property color textColor: {
+    property alias textColor: btn_text.textColor
-        if(FluTheme.dark){
-            if(!enabled){
-                return Qt.rgba(130/255,130/255,130/255,1)
-            }
-            return Qt.rgba(1,1,1,1)
-        }else{
-            if(!enabled){
-                return Qt.rgba(161/255,161/255,161/255,1)
-            }
-            return Qt.rgba(0,0,0,1)
-        }
-    }
     property bool textRight: true
     property real textSpacing: 6
     property bool animationEnabled: FluTheme.animationEnabled
@@ -141,7 +129,6 @@ Button {
             Layout.alignment: Qt.AlignVCenter
             visible: text !== ""
             font: control.font
-            color: control.textColor
         }
     }
 }

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

@@ -48,17 +48,6 @@ Button{
         implicitWidth: 326
         implicitHeight: 560
         closePolicy: Popup.CloseOnEscape
-        onClosed: {
-            text_box_r.focus = false;
-            text_box_g.focus = false;
-            text_box_b.focus = false;
-            text_box_a.focus = false;
-            text_box_color.focus = false;
-        }
-        onOpened: {
-            layout_color_hue.updateColorText(current);
-            text_box_color.textEdited();
-        }
         Rectangle{
             id:layout_actions
             width: parent.width
@@ -160,9 +149,7 @@ Button{
                             if(color.a===1){
                                 colorString = "FF"+colorString
                             }
-                            if (!text_box_color.activeFocus) {
+                            text_box_color.text = colorString.toUpperCase()
-                                text_box_color.text = colorString.toUpperCase();
-                            }
                         }
                         property color blackColor: {
                             var c = whiteColor
@@ -293,11 +280,6 @@ Button{
                         preventStealing: true
                         function handleMouse(mouse) {
                             if (mouse.buttons & Qt.LeftButton) {
-                                text_box_r.focus = false;
-                                text_box_g.focus = false;
-                                text_box_b.focus = false;
-                                text_box_a.focus = false;
-                                text_box_color.focus = false;
                                 pickerCursor.x = Math.max(0,Math.min(mouse.x - colorHandleRadius,width-2*colorHandleRadius));
                                 pickerCursor.y = Math.max(0,Math.min(mouse.y - colorHandleRadius,height-2*colorHandleRadius));
                             }
@@ -388,11 +370,6 @@ Button{
                             preventStealing: true
                             function handleMouse(mouse) {
                                 if (mouse.buttons & Qt.LeftButton) {
-                                    text_box_r.focus = false;
-                                    text_box_g.focus = false;
-                                    text_box_b.focus = false;
-                                    text_box_a.focus = false;
-                                    text_box_color.focus = false;
                                     blackCursor.x = Math.max(0,Math.min(mouse.x - 6,width-2*6));
                                     blackCursor.y = 0
                                 }
@@ -462,11 +439,6 @@ Button{
                             preventStealing: true
                             function handleMouse(mouse) {
                                 if (mouse.buttons & Qt.LeftButton) {
-                                    text_box_r.focus = false;
-                                    text_box_g.focus = false;
-                                    text_box_b.focus = false;
-                                    text_box_a.focus = false;
-                                    text_box_color.focus = false;
                                     opacityCursor.x = Math.max(0,Math.min(mouse.x - 6,width-2*6));
                                     opacityCursor.y = 0
                                 }
@@ -501,7 +473,7 @@ Button{
                             id:text_box_color
                             width: 136
                             validator: RegularExpressionValidator {
-                                regularExpression: /^[0-9A-Fa-f]{8}$/
+                                regularExpression: /^[0-9A-F]{8}$/
                             }
                             anchors{
                                 right: parent.right
@@ -524,11 +496,6 @@ Button{
                                                 parseInt(colorString.substring(6, 8), 16) / 255,
                                                 parseInt(colorString.substring(0, 2), 16) / 255)
                                     layout_color_hue.colorValue = c
-                                    layout_color_hue.updateColorText(c);
-                                    text_box_r.textEdited();
-                                    text_box_g.textEdited();
-                                    text_box_b.textEdited();
-                                    text_box_a.textEdited();
                                 }
                             }
                         }

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

@@ -107,7 +107,7 @@ T.ComboBox {
         y: control.height
         width: control.width
         height: Math.min(contentItem.implicitHeight, control.Window.height - topMargin - bottomMargin)
-        topMargin: 32
+        topMargin: 6
         bottomMargin: 6
         modal: true
         contentItem: ListView {

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

@@ -41,7 +41,7 @@ FluPopup {
             FluText{
                 id:text_message
                 font: FluTextStyle.Body
-                wrapMode: Text.WordWrap
+                wrapMode: Text.WrapAnywhere
                 text:message
                 width: parent.width
                 topPadding: 4
@@ -67,7 +67,7 @@ FluPopup {
                 topPadding: 20
                 leftPadding: 20
                 rightPadding: 20
-                wrapMode: Text.WordWrap
+                wrapMode: Text.WrapAnywhere
             }
             FluLoader{
                 sourceComponent: com_message

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

@@ -3,19 +3,7 @@ import QtQuick.Controls
 import FluentUI
 
 TextEdit {
-    property color textColor: {
+    property color textColor: FluTheme.dark ? FluColors.White : FluColors.Grey220
-        if(FluTheme.dark){
-            if(!enabled){
-                return Qt.rgba(130/255,130/255,130/255,1)
-            }
-            return Qt.rgba(1,1,1,1)
-        }else{
-            if(!enabled){
-                return Qt.rgba(161/255,161/255,161/255,1)
-            }
-            return Qt.rgba(0,0,0,1)
-        }
-    }
     id:control
     color: textColor
     readOnly: true

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

@@ -5,8 +5,6 @@ import FluentUI
 
 Item {
     property string  headerText: ""
-    property int headerHeight : 45
-    property Component headerDelegate: com_header
     property bool expand: false
     property int contentHeight : 300
     default property alias content: container.data
@@ -23,23 +21,10 @@ Item {
         }
     }
     clip: true
-    Component {
-        id: com_header
-        Item {
-            FluText {
-                text: control.headerText
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                    left: parent.left
-                    leftMargin: 15
-                }
-            }
-        }
-    }
     Rectangle{
         id:layout_header
         width: parent.width
-        height: control.headerHeight
+        height: 45
         radius: 4
         border.color: FluTheme.dividerColor
         color: {
@@ -56,17 +41,15 @@ Item {
                 d.toggle()
             }
         }
-        FluLoader {
+        FluText{
-            anchors {
+            text: headerText
-                top: parent.top
+            anchors{
-                bottom: parent.bottom
+                verticalCenter: parent.verticalCenter
                 left: parent.left
-                right: btn_toggle.left
+                leftMargin: 15
             }
-            sourceComponent: control.headerDelegate
         }
         FluIconButton{
-            id: btn_toggle
             anchors{
                 verticalCenter: parent.verticalCenter
                 right: parent.right

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

@@ -5,19 +5,7 @@ import FluentUI
 Text {
     property int iconSource
     property int iconSize: 20
-    property color iconColor: {
+    property color iconColor: FluTheme.dark ? "#FFFFFF" : "#000000"
-        if(FluTheme.dark){
-            if(!enabled){
-                return Qt.rgba(130/255,130/255,130/255,1)
-            }
-            return Qt.rgba(1,1,1,1)
-        }else{
-            if(!enabled){
-                return Qt.rgba(161/255,161/255,161/255,1)
-            }
-            return Qt.rgba(0,0,0,1)
-        }
-    }
     id:control
     font.family: font_loader.name
     font.pixelSize: iconSize

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

@@ -38,19 +38,7 @@ Button {
             return Qt.rgba(0,0,0,1)
         }
     }
-    property color textColor: {
+    property color textColor: FluTheme.fontPrimaryColor
-        if(FluTheme.dark){
-            if(!enabled){
-                return Qt.rgba(130/255,130/255,130/255,1)
-            }
-            return Qt.rgba(1,1,1,1)
-        }else{
-            if(!enabled){
-                return Qt.rgba(161/255,161/255,161/255,1)
-            }
-            return Qt.rgba(0,0,0,1)
-        }
-    }
     Accessible.role: Accessible.Button
     Accessible.name: control.text
     Accessible.description: contentDescription

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

@@ -190,13 +190,13 @@ FluObject {
                     spacing: 5
                     FluText{
                         text:_super.text
-                        wrapMode: Text.WordWrap
+                        wrapMode: Text.WrapAnywhere
                         width: Math.min(implicitWidth,mcontrol.maxWidth)
                     }
                     FluText{
                         text: _super.moremsg
                         visible: _super.moremsg
-                        wrapMode : Text.WordWrap
+                        wrapMode : Text.WrapAnywhere
                         textColor: FluColors.Grey120
                         width: Math.min(implicitWidth,mcontrol.maxWidth)
                     }

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

@@ -21,7 +21,7 @@ TextArea{
         return normalColor
     }
     font:FluTextStyle.Body
-    wrapMode: Text.WordWrap
+    wrapMode: Text.WrapAnywhere
     padding: 8
     leftPadding: padding+4
     renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering

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

@@ -1314,7 +1314,7 @@ Item {
             d.stackItems = d.stackItems.concat(nav_list.model[nav_list.currentIndex])
         }
         function noStackPush(){
-            if(loader_content.source.toString() === url && Object.keys(argument).length === 0){
+            if(loader_content.source.toString() === url){
                 return
             }
             loader_content.setSource(url,argument)

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

@@ -6,9 +6,8 @@ import FluentUI
 Page {
     default property alias content: d.children
     property alias currentIndex: nav_list.currentIndex
-    property color textHighlightColor: FluTheme.dark ? FluColors.Grey10 : FluColors.Black
     property color textNormalColor: FluTheme.dark ? FluColors.Grey120 : FluColors.Grey120
-    property color textHoverColor: FluTheme.dark ? FluColors.Grey80 : FluColors.Grey150
+    property color textHoverColor: FluTheme.dark ? FluColors.Grey10 : FluColors.Black
     property int textSpacing: 10
     property int headerSpacing: 20
     property int headerHeight: 40
@@ -32,15 +31,21 @@ Page {
         interactive: false
         orientation: ListView.Horizontal
         highlightMoveDuration: FluTheme.animationEnabled ? 167 : 0
-        highlightResizeDuration: FluTheme.animationEnabled ? 167 : 0
         highlight: Item{
             clip: true
             Rectangle{
                 height: 3
                 radius: 1.5
                 color: FluTheme.primaryColor
-                width: nav_list.currentItem.width
+                width: nav_list.currentItem ? nav_list.currentItem.width : 0
                 y:d.tabY
+                Behavior on width {
+                    enabled: FluTheme.animationEnabled
+                    NumberAnimation{
+                        duration: 167
+                        easing.type: Easing.OutCubic
+                    }
+                }
             }
         }
         delegate: Button{
@@ -62,13 +67,9 @@ Page {
                     anchors.centerIn: parent
                     font: control.font
                     color: {
-                        if(nav_list.currentIndex === index) {
+                        if(item_button.hovered)
-                            return textHighlightColor;
+                            return textHoverColor
-                        }
+                        return textNormalColor
-                        if (item_button.hovered) {
-                            return textHoverColor;
-                        } 
-                        return textNormalColor;
                     }
                 }
             }

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

@@ -15,6 +15,13 @@ 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
@@ -35,20 +42,13 @@ ProgressBar{
             height: parent.height
             radius: d._radius
             color: control.color
-            SequentialAnimation on x {
+            PropertyAnimation on x {
-                id: animator_x
+                id:animator_x
                 running: control.indeterminate && control.visible
+                from: -rect_progress.width
+                to:control.width+rect_progress.width
                 loops: Animation.Infinite
-                onRunningChanged: {
+                duration: control.duration
-                    if(!running){
-                        rect_progress.x = 0
-                    }
-                }
-                PropertyAnimation {
-                    from: -rect_progress.width
-                    to: control.width + rect_progress.width
-                    duration: control.duration
-                }
             }
         }
     }

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

@@ -12,19 +12,7 @@ Button {
     property color normalColor: FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(1,1,1,1)
     property color hoverColor: checked ? FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(1,1,1,1) : FluTheme.dark ? Qt.rgba(43/255,43/255,43/255,1) : Qt.rgba(222/255,222/255,222/255,1)
     property color disableColor: checked ? FluTheme.dark ? Qt.rgba(159/255,159/255,159/255,1) : Qt.rgba(159/255,159/255,159/255,1)  : FluTheme.dark ? Qt.rgba(43/255,43/255,43/255,1) : Qt.rgba(222/255,222/255,222/255,1)
-    property color textColor: {
+    property alias textColor: btn_text.textColor
-        if(FluTheme.dark){
-            if(!enabled){
-                return Qt.rgba(130/255,130/255,130/255,1)
-            }
-            return Qt.rgba(1,1,1,1)
-        }else{
-            if(!enabled){
-                return Qt.rgba(161/255,161/255,161/255,1)
-            }
-            return Qt.rgba(0,0,0,1)
-        }
-    }
     property real size: 18
     property bool textRight: true
     property real textSpacing: 6
@@ -102,7 +90,6 @@ Button {
             Layout.alignment: Qt.AlignVCenter
             font: control.font
             visible: text !== ""
-            color: control.textColor
         }
     }
 }

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

@@ -5,11 +5,8 @@ import QtQuick.Controls
 import FluentUI
 
 FluPage {
-    property bool autoResetScroll: false
     default property alias content: container.data
-
     Flickable{
-        id: flickable
         clip: true
         anchors.fill: parent
         ScrollBar.vertical: FluScrollBar {}
@@ -20,14 +17,4 @@ FluPage {
             width: parent.width
         }
     }
-
-    function resetScroll() {
-        flickable.contentY = 0;
-    }
-
-    StackView.onActivated: {
-        if (autoResetScroll) {
-            resetScroll(); // Call this function to reset the scroll position to the top
-        }
-    }
 }

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

@@ -5,7 +5,7 @@ import FluentUI
 Text {
     property color textColor: FluTheme.fontPrimaryColor
     id:text
-    color: enabled ? textColor : (FluTheme.dark ? Qt.rgba(131/255,131/255,131/255,1) : Qt.rgba(160/255,160/255,160/255,1))
+    color: textColor
     renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
     font: FluTextStyle.Body
 }

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

@@ -335,7 +335,7 @@ FluButton {
                             if (hours === "12") {
                                 hours24 = (period === control.amText) ? 0 : 12;
                             } else {
-                                hours24 = (period === control.pmText) ? hours24 + 12 : hours24;
+                                hours24 = (period === control.pmText) ? hours24 : hours24 + 12;
                             }
                         }
                         date.setHours(hours24);

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

@@ -98,7 +98,7 @@ Item{
     Component{
         id:com_lable
         FluText{
-            wrapMode: Text.WordWrap
+            wrapMode: Text.WrapAnywhere
             horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
             text: {
                 if(modelData.lable){
@@ -113,7 +113,7 @@ Item{
     Component{
         id:com_text
         FluText{
-            wrapMode: Text.WordWrap
+            wrapMode: Text.WrapAnywhere
             horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
             text: modelData.text
             textFormat: Text.RichText