update

Imporve FluContentDialog and add relative example.

README.md

@@ -2,7 +2,7 @@
 
 ## 简介
 
-这是一个漂亮的Fluent组件库，使用QML插件开发的
+这是一个漂亮的Fluent组件库，使用QML插件开发的。main分支是Qt6.4.3，如果需要qt5的请切换至qt5分支
 
 ## 编译状态
 | [Windows][win-link]| [Ubuntu][ubuntu-link]|[MacOS][macos-link]|
@@ -96,4 +96,4 @@
 ![](doc/preview/carousel.png)
 
 ### ⚡ Visitor count
-![](https://profile-counter.glitch.me/zhuzichu520-FluentUI/count.svg)
+![](https://profile-counter.glitch.me/zhuzichu520-FluentUI/count.svg)

example/App.qml

@@ -2,27 +2,25 @@
 import QtQuick.Window
 import QtQuick.Controls
 import QtQuick.Layouts
-import QtMultimedia
 import FluentUI
 
 Window {
     id:app
-    color: "#00000000"
-    //初始化一个MediaPlayer，解决macos切换到T_MediaPalyer页面崩溃问题
-    MediaPlayer{}
     Component.onCompleted: {
-        FluApp.init(app,properties)
+        FluApp.init(app)
         FluTheme.frameless = ("windows" === Qt.platform.os)
-        FluTheme.dark = false
+        FluTheme.darkMode = FluDarkMode.System
         FluApp.routes = {
             "/":"qrc:/page/MainPage.qml",
             "/about":"qrc:/page/AboutPage.qml",
             "/login":"qrc:/page/LoginPage.qml",
             "/chat":"qrc:/page/ChatPage.qml",
             "/media":"qrc:/page/MediaPage.qml",
+            "/singleTaskWindow":"qrc:/page/SingleTaskWindow.qml",
+            "/standardWindow":"qrc:/page/StandardWindow.qml",
+            "/singleInstanceWindow":"qrc:/page/SingleInstanceWindow.qml"
         }
         FluApp.initialRoute = "/"
         FluApp.run()
     }
-
 }

example/AppInfo.cpp

@@ -0,0 +1,25 @@
+#include "AppInfo.h"
+#include "lang/En.h"
+#include "lang/Zh.h"
+
+
+AppInfo::AppInfo(QObject *parent)
+    : QObject{parent}
+{
+    version("1.2.6");
+    lang(new En());
+}
+
+void AppInfo::changeLang(const QString& locale){
+    if(_lang){
+        _lang->deleteLater();
+    }
+    if(locale=="Zh"){
+        lang(new Zh());
+    }else if(locale=="En"){
+        lang(new En());
+    }else {
+        lang(new En());
+    }
+
+}

example/AppInfo.h

@@ -0,0 +1,18 @@
+#ifndef APPINFO_H
+#define APPINFO_H
+
+#include <QObject>
+#include "lang/Lang.h"
+#include "stdafx.h"
+
+class AppInfo : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY_AUTO(QString,version)
+    Q_PROPERTY_AUTO(Lang*,lang)
+public:
+    explicit AppInfo(QObject *parent = nullptr);
+    Q_INVOKABLE void changeLang(const QString& locale);
+};
+
+#endif // APPINFO_H

example/CMakeLists.txt

@@ -25,11 +25,13 @@ find_package(Qt6 COMPONENTS Core Quick QuickControls2 Concurrent Network Multime
 
 set(SOURCES
     ChatController.cpp
+	AppInfo.cpp 
     main.cpp
 )
 
 set(HEADERS
     ChatController.h
+	AppInfo.h
 )
 
 set(RESOURCES

example/T_Badge.qml

@@ -103,6 +103,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'Rectangle{
     width: 40
     height: 40

example/T_Buttons.qml

@@ -2,6 +2,7 @@
 import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
+import QtQuick.Controls.Basic
 import FluentUI
 import "./component"
 
@@ -51,6 +52,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluTextButton{
     text:"Text Button"
     onClicked: {
@@ -92,6 +94,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluButton{
     text:"Standard Button"
     onClicked: {
@@ -133,6 +136,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluFilledButton{
     text:"Filled Button"
     onClicked: {
@@ -174,6 +178,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluToggleButton{
     text:"Toggle Button"
     onClicked: {
@@ -216,6 +221,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluIconButton{
     iconSource:FluentIcons.ChromeCloseContrast
     onClicked: {
@@ -266,6 +272,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluDropDownButton{
     text:"DropDownButton"
     items:[
@@ -327,6 +334,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluRadioButton{
     selected:true
     text:"Text Button"
@@ -365,6 +373,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluCheckBox{
     text:"Check Box"
 }'

example/T_CalendarPicker.qml

@@ -23,6 +23,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluCalendarView{
 
 }'
@@ -44,6 +45,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluCalendarPicker{
 
 }'

example/T_Carousel.qml

@@ -39,6 +39,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluCarousel{
     width: 400
     height: 300

example/T_CheckBox.qml

@@ -30,6 +30,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluCheckBox{
     text:"Text"
 }'

example/T_ColorPicker.qml

@@ -41,6 +41,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluColorView{
 
 }'
@@ -64,6 +65,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluColorPicker{
 
 }'

example/T_DatePicker.qml

@@ -32,6 +32,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluDatePicker{
 
 }'
@@ -59,6 +60,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluDatePicker{
     showYear:false
 }'

example/T_Dialog.qml

@@ -18,22 +18,24 @@ FluScrollablePage{
         height: 68
         paddings: 10
         Layout.topMargin: 20
-            FluButton{
-                anchors.verticalCenter: parent.verticalCenter
-                Layout.topMargin: 20
-                text:"Show Dialog"
-                onClicked: {
-                    dialog.open()
-                }
+        FluButton{
+            anchors.verticalCenter: parent.verticalCenter
+            Layout.topMargin: 20
+            text:"Show Double Button Dialog"
+            onClicked: {
+                double_btn_dialog.open()
             }
+        }
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluContentDialog{
     id:dialog
     title:"友情提示"
     message:"确定要退出程序么？"
     negativeText:"取消"
+    buttonFlags: FluContentDialog.NegativeButton | FluContentDialog.PositiveButton
     onNegativeClicked:{
         showSuccess("点击取消按钮")
     }
@@ -41,15 +43,15 @@ FluScrollablePage{
     onPositiveClicked:{
         showSuccess("点击确定按钮")
     }
-}
-dialog.open()
-'
+    }
+    dialog.open()'
     }
 
     FluContentDialog{
-        id:dialog
+        id:double_btn_dialog
         title:"友情提示"
         message:"确定要退出程序么？"
+        buttonFlags: FluContentDialog.NegativeButton | FluContentDialog.PositiveButton
         negativeText:"取消"
         onNegativeClicked:{
             showSuccess("点击取消按钮")
@@ -60,5 +62,61 @@ dialog.open()
         }
     }
 
+    FluArea{
+        Layout.fillWidth: true
+        height: 68
+        paddings: 10
+        Layout.topMargin: 20
+        FluButton{
+            anchors.verticalCenter: parent.verticalCenter
+            Layout.topMargin: 20
+            text:"Show Triple Button Dialog"
+            onClicked: {
+                triple_btn_dialog.open()
+            }
+        }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluContentDialog{
+    id:dialog
+    title:"友情提示"
+    message:"确定要退出程序么？"
+    negativeText:"取消"
+    buttonFlags: FluContentDialog.NeutralButton | FluContentDialog.NegativeButton | FluContentDialog.PositiveButton
+    negativeText:"取消"
+    onNegativeClicked:{
+        showSuccess("点击取消按钮")
+    }
+    positiveText:"确定"
+    onPositiveClicked:{
+        showSuccess("点击确定按钮")
+    }
+    neutralText:"最小化"
+    onNeutralClicked:{
+        showSuccess("点击最小化按钮")
+        }
+    }
+    dialog.open()'
+    }
 
+    FluContentDialog{
+        id:triple_btn_dialog
+        title:"友情提示"
+        message:"确定要退出程序么？"
+        buttonFlags: FluContentDialog.NeutralButton | FluContentDialog.NegativeButton | FluContentDialog.PositiveButton
+        negativeText:"取消"
+        onNegativeClicked:{
+            showSuccess("点击取消按钮")
+        }
+        positiveText:"确定"
+        onPositiveClicked:{
+            showSuccess("点击确定按钮")
+        }
+        neutralText:"最小化"
+        onNeutralClicked:{
+            showSuccess("点击最小化按钮")
+        }
+    }
 }

example/T_Expander.qml

@@ -15,14 +15,14 @@ FluScrollablePage{
 
     FluArea{
         Layout.fillWidth: true
-        height: layout_column.height+40
+        height: layout_column.height+20
         paddings: 10
         Layout.topMargin: 20
         Column{
             id:layout_column
             spacing: 15
             anchors{
-                verticalCenter: parent.verticalCenter
+                top:parent.top
                 left:parent.left
             }
 
@@ -77,12 +77,12 @@ FluScrollablePage{
                     }
                 }
             }
-
         }
     }
 
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluExpander{
     headerText:"打开一个单选框"
     Item{

example/T_FlipView.qml

@@ -44,6 +44,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluFlipView{
     Image{
         source: "qrc:/res/image/banner_1.jpg"
@@ -97,6 +98,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluFlipView{
     vertical:true
     Image{

example/T_InfoBar.qml

@@ -52,6 +52,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'showInfo("这是一个Info样式的InfoBar")
 
 showWarning("这是一个Warning样式的InfoBar")

example/T_MediaPlayer.qml

@@ -38,6 +38,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluMediaPlayer{
     id:player
     source:"http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4"

example/T_Menu.qml

@@ -53,6 +53,7 @@ FluScrollablePage{
 
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluMenu{
     id:menu
     FluMenuItem:{

example/T_MultiWindow.qml

@@ -24,6 +24,87 @@ FluScrollablePage{
         }
     }
 
+    FluArea{
+        Layout.fillWidth: true
+        height: 86
+        paddings: 10
+        Layout.topMargin: 20
+        Column{
+            spacing: 15
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+            FluText{
+                text:"<font color='red'>Standard</font>模式窗口，每次都会创建新窗口"
+            }
+            FluButton{
+                text:"点击创建窗口"
+                onClicked: {
+                    FluApp.navigate("/standardWindow")
+                }
+            }
+        }
+    }
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 86
+        paddings: 10
+        Layout.topMargin: 10
+        Column{
+            spacing: 15
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+            FluText{
+                text:"<font color='red'>SingleTask</font>模式窗口，如果窗口存在，这激活该窗口"
+                textFormat: Text.RichText
+            }
+            FluButton{
+                text:"点击创建窗口"
+                onClicked: {
+                    FluApp.navigate("/singleTaskWindow")
+                }
+            }
+        }
+    }
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 86
+        paddings: 10
+        Layout.topMargin: 10
+        Column{
+            spacing: 15
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+            FluText{
+                text:"<font color='red'>SingleInstance</font>模式窗口，如果窗口存在，则销毁窗口，然后新建窗口"
+            }
+            FluButton{
+                text:"点击创建窗口"
+                onClicked: {
+                    FluApp.navigate("/singleInstanceWindow")
+                }
+            }
+        }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluWindow{
+  //launchMode: FluWindow.Standard
+  //launchMode: FluWindow.SingleTask
+     launchMode: FluWindow.SingleInstance
+}
+'
+    }
+
+
     FluArea{
         Layout.fillWidth: true
         height: 100
@@ -48,6 +129,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluButton{
     text:"点击跳转"
     onClicked: {
@@ -85,6 +167,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'property var loginPageRegister: registerForPageResult("/login")
 
 Connections{

example/T_Pivot.qml

@@ -21,6 +21,7 @@ FluScrollablePage{
 
         FluPivot{
             anchors.fill: parent
+            currentIndex: 2
             FluPivotItem{
                 title:"All"
                 contentItem:FluText{
@@ -49,6 +50,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluPivot{
     anchors.fill: parent
     FluPivotItem:{

example/T_Progress.qml

@@ -47,6 +47,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluProgressBar{
 
 }

example/T_RatingControl.qml

@@ -0,0 +1,44 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import FluentUI
+import "./component"
+
+FluScrollablePage{
+
+    title:"RatingControl"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
+    spacing: 0
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 100
+        paddings: 10
+        Layout.topMargin: 20
+
+        Column{
+            spacing: 10
+            anchors.verticalCenter: parent.verticalCenter
+            FluRatingControl{
+
+            }
+            FluRatingControl{
+                number:10
+            }
+        }
+
+    }
+
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluRatingControl{
+
+}'
+    }
+
+
+}

example/T_Rectangle.qml

@@ -134,6 +134,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluRectangle{
     radius: [25,25,25,25]
     width: 50

example/T_Settings.qml

@@ -0,0 +1,117 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import FluentUI
+import "qrc:///global/"
+import "./component"
+
+FluScrollablePage{
+
+    title:"Settings"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
+    spacing: 0
+
+    FluArea{
+        Layout.fillWidth: true
+        Layout.topMargin: 20
+        height: 136
+        paddings: 10
+
+        ColumnLayout{
+            spacing: 10
+            anchors{
+                top: parent.top
+                left: parent.left
+            }
+            FluText{
+                text:lang.dark_mode
+                fontStyle: FluText.BodyStrong
+                Layout.bottomMargin: 4
+            }
+            Repeater{
+                model: [{title:"System",mode:FluDarkMode.System},{title:"Light",mode:FluDarkMode.Light},{title:"Dark",mode:FluDarkMode.Dark}]
+                delegate:  FluRadioButton{
+                    selected : FluTheme.darkMode === modelData.mode
+                    text:modelData.title
+                    onClicked:{
+                        FluTheme.darkMode = modelData.mode
+                    }
+                }
+            }
+
+
+        }
+
+    }
+
+    FluArea{
+        Layout.fillWidth: true
+        Layout.topMargin: 20
+        height: 168
+        paddings: 10
+
+        ColumnLayout{
+            spacing: 10
+            anchors{
+                top: parent.top
+                left: parent.left
+            }
+
+            FluText{
+                text:lang.navigation_view_display_mode
+                fontStyle: FluText.BodyStrong
+                Layout.bottomMargin: 4
+            }
+            Repeater{
+                model: [{title:"Open",mode:FluNavigationView.Open},{title:"Compact",mode:FluNavigationView.Compact},{title:"Minimal",mode:FluNavigationView.Minimal},{title:"Auto",mode:FluNavigationView.Auto}]
+                delegate:  FluRadioButton{
+                    selected : MainEvent.displayMode===modelData.mode
+                    text:modelData.title
+                    onClicked:{
+                        MainEvent.displayMode = modelData.mode
+                    }
+                }
+            }
+        }
+    }
+
+    FluArea{
+        Layout.fillWidth: true
+        Layout.topMargin: 20
+        height: 80
+        paddings: 10
+
+        ColumnLayout{
+            spacing: 10
+            anchors{
+                top: parent.top
+                left: parent.left
+            }
+
+            FluText{
+                text:lang.locale
+                fontStyle: FluText.BodyStrong
+                Layout.bottomMargin: 4
+            }
+
+            Flow{
+                spacing: 5
+                Repeater{
+                    model: ["Zh","En"]
+                    delegate:  FluRadioButton{
+                        selected : appInfo.lang.objectName === modelData
+                        text:modelData
+                        onClicked:{
+                            console.debug(modelData)
+                            appInfo.changeLang(modelData)
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+}

example/T_Slider.qml

@@ -25,6 +25,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluSlider{
     value:50
 }'
@@ -46,6 +47,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluSlider{
     vertical:true
     value:50

example/T_StatusView.qml

@@ -78,6 +78,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluStatusView{
     anchors.fill: parent
     statusMode: FluStatusView.Loading

example/T_TabView.qml

@@ -113,6 +113,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluTabView{
     anchors.fill: parent
     Component.onCompleted: {

example/T_TableView.qml

@@ -110,7 +110,6 @@ FluScrollablePage{
     id:table_view
     Layout.fillWidth: true
     Layout.topMargin: 20
-    width:parent.width
     pageCurrent:1
     pageCount:10
     itemCount: 1000
@@ -141,15 +140,15 @@ FluScrollablePage{
                               width:100
                           }
                       ];
-            table_view.columns = columns
+        table_view.columns = columns
         const dataSource = [
-                          {
-                              name: "孙悟空”,
-                              age: 500,
-                              address:"钟灵毓秀的花果山,如神仙仙境的水帘洞",
+                {
+                    name: "孙悟空”,
+                    age: 500,
+                    address:"钟灵毓秀的花果山,如神仙仙境的水帘洞",
                     nickname:"齐天大圣"
-                          }
-                      ];
+                }
+        ];
         table_view.dataSource = columns
     }
 }'

example/T_TextBox.qml

@@ -45,19 +45,59 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluTextBox{
     placeholderText:"单行输入框"
 }'
     }
 
-
     FluArea{
         Layout.fillWidth: true
         height: 68
         paddings: 10
         Layout.topMargin: 20
 
+        FluPasswordBox{
+            Layout.topMargin: 20
+            placeholderText: "请输入密码"
+            Layout.preferredWidth: 300
+            disabled:password_box_switch.selected
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+        }
+
+        Row{
+            spacing: 5
+            anchors{
+                verticalCenter: parent.verticalCenter
+                right: parent.right
+            }
+            FluToggleSwitch{
+                id:password_box_switch
+                Layout.alignment: Qt.AlignRight
+                text:"Disabled"
+            }
+        }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluPasswordBox{
+    placeholderText:"请输入密码"
+}'
+    }
+
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 36+multiine_textbox.height
+        paddings: 10
+        Layout.topMargin: 20
+
         FluMultilineTextBox{
+            id:multiine_textbox
             Layout.topMargin: 20
             placeholderText: "多行输入框"
             Layout.preferredWidth: 300
@@ -83,6 +123,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluMultilineTextBox{
     placeholderText:"多行输入框"
 }'
@@ -122,6 +163,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluAutoSuggestBox{
     placeholderText:"AutoSuggestBox"
 }'

example/T_Theme.qml

@@ -58,7 +58,11 @@ FluScrollablePage{
                 Layout.topMargin: 5
                 selected: FluTheme.dark
                 clickFunc:function(){
-                    FluTheme.dark = !FluTheme.dark
+                    if(FluTheme.dark){
+                        FluTheme.darkMode = FluDarkMode.Light
+                    }else{
+                        FluTheme.darkMode = FluDarkMode.Dark
+                    }
                 }
             }
             FluText{
@@ -76,12 +80,12 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluTheme.primaryColor = FluColors.Orange
 
 FluTheme.dark = true
 
-FluTheme.nativeText = true
-'
+FluTheme.nativeText = true'
     }
 
 

example/T_TimePicker.qml

@@ -37,6 +37,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluTimePicker{
 
 }'
@@ -67,6 +68,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluTimePicker{
     hourFormat:FluTimePicker.HH
 }'

example/T_ToggleSwitch.qml

@@ -30,6 +30,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluToggleSwitch{
     text:"Text"
 }'

example/T_Tooltip.qml

@@ -45,6 +45,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluIconButton{
     iconSource:FluentIcons.ChromeCloseContrast
     iconSize: 15
@@ -87,6 +88,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluButton{
     id:button_1
     text:"删除"
@@ -98,8 +100,7 @@ FluScrollablePage{
     onClicked:{
         showSuccess("点击一个Button")
     }
-}
-'
+}'
     }
 
 

example/T_TreeView.qml

@@ -142,6 +142,7 @@ FluScrollablePage {
 
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluTreeView{
     id:tree_view
     width:240

example/component/CodeExpander.qml

@@ -68,7 +68,6 @@ FluExpander{
           "FluComboBox",
           "FluContentDialog",
           "FluContentPage",
-          "FluControl",
           "FluDatePicker",
           "FluDivider",
           "FluDropDownButton",
@@ -118,7 +117,9 @@ FluExpander{
           "FluTableView",
           "FluColors",
           "FluTheme",
-          "FluStatusView"
+          "FluStatusView",
+          "FluRatingControl",
+          "FluPasswordBox"
       ];
       code = code.replace(/\n/g, "<br>");
       code = code.replace(/ /g, "&nbsp;");

example/example.pro

@@ -1,12 +1,21 @@
-QT += quick quickcontrols2 concurrent network multimedia
+QT += quick concurrent network multimedia
 CONFIG += c++17
 DEFINES += QT_DEPRECATED_WARNINGS QT_NO_WARNING_OUTPUT
 
 HEADERS += \
-    ChatController.h
+    lang/En.h \
+    lang/Lang.h \
+    lang/Zh.h \
+    stdafx.h \
+    ChatController.h \
+    AppInfo.h
 
 SOURCES += \
         ChatController.cpp \
+        AppInfo.cpp \
+        lang/En.cpp \
+        lang/Lang.cpp \
+        lang/Zh.cpp \
         main.cpp
 
 RESOURCES += qml.qrc

example/global/ItemsFooter.qml

@@ -5,17 +5,22 @@ import FluentUI
 
 FluObject{
     id:footer_items
+
+    property var navigationView
+
     FluPaneItemSeparator{}
     FluPaneItem{
-        title:"意见反馈"
-        onTap:{
-            Qt.openUrlExternally("https://github.com/zhuzichu520/FluentUI/issues/new")
-        }
-    }
-    FluPaneItem{
-        title:"关于"
-        onTap:{
+        title:lang.about
+        icon:FluentIcons.Contact
+        tapFunc:function(){
             FluApp.navigate("/about")
         }
     }
+    FluPaneItem{
+        title:lang.settings
+        icon:FluentIcons.Settings
+        onTap:{
+            navigationView.push("qrc:/T_Settings.qml")
+        }
+    }
 }

example/global/ItemsOriginal.qml

@@ -8,15 +8,22 @@ FluObject{
     property var navigationView
 
     FluPaneItem{
-        title:"Home"
-        icon:FluentIcons.Home
+        title:lang.home
+        //        icon:FluentIcons.Home
+        cusIcon: Image{
+            anchors.centerIn: parent
+            source: FluTheme.dark ? "qrc:/res/svg/home_dark.svg" : "qrc:/res/svg/home.svg"
+            sourceSize: Qt.size(30,30)
+            width: 18
+            height: 18
+        }
         onTap:{
             navigationView.push("qrc:/T_Home.qml")
         }
     }
 
     FluPaneItemExpander{
-        title:"Basic input"
+        title:lang.basic_input
         icon:FluentIcons.CheckboxComposite
         FluPaneItem{
             title:"Buttons"
@@ -54,7 +61,7 @@ FluObject{
     }
 
     FluPaneItemExpander{
-        title:"Form"
+        title:lang.form
         icon:FluentIcons.GridView
         FluPaneItem{
             title:"TextBox"
@@ -89,7 +96,7 @@ FluObject{
     }
 
     FluPaneItemExpander{
-        title:"Surface"
+        title:lang.surface
         icon:FluentIcons.SurfaceHub
         FluPaneItem{
             title:"InfoBar"
@@ -106,6 +113,12 @@ FluObject{
                 navigationView.push("qrc:/T_Progress.qml")
             }
         }
+        FluPaneItem{
+            title:"RatingControl"
+            onTap:{
+                navigationView.push("qrc:/T_RatingControl.qml")
+            }
+        }
         FluPaneItem{
             title:"Badge"
             onTap:{
@@ -139,7 +152,7 @@ FluObject{
     }
 
     FluPaneItemExpander{
-        title:"Popus"
+        title:lang.popus
         icon:FluentIcons.ButtonMenu
         FluPaneItem{
             title:"Dialog"
@@ -162,7 +175,7 @@ FluObject{
     }
 
     FluPaneItemExpander{
-        title:"Navigation"
+        title:lang.navigation
         icon:FluentIcons.AllApps
         FluPaneItem{
             title:"Pivot"
@@ -219,7 +232,7 @@ FluObject{
     }
 
     FluPaneItemExpander{
-        title:"Theming"
+        title:lang.theming
         icon:FluentIcons.Brightness
         FluPaneItem{
             title:"Theme"
@@ -242,7 +255,7 @@ FluObject{
     }
 
     FluPaneItemExpander{
-        title:"Media"
+        title:lang.media
         icon:FluentIcons.Media
         FluPaneItem{
             title:"MediaPlayer"
@@ -301,21 +314,7 @@ FluObject{
     }
 
     function startPageByItem(data){
-        var items = navigationView.getItems();
-        for(var i=0;i<items.length;i++){
-            var item =  items[i]
-            if(item.key === data.key){
-                if(navigationView.getCurrentIndex() === i){
-                    return
-                }
-                item.tap()
-                navigationView.setCurrentIndex(i)
-                if(item.parent){
-                    item.parent.isExpand = true
-                }
-                return
-            }
-        }
+        navigationView.startPageByItem(data)
     }
 
 }

example/global/MainEvent.qml

@@ -0,0 +1,9 @@
+pragma Singleton
+
+import QtQuick
+import QtQuick.Controls
+import FluentUI
+
+QtObject {
+    property int displayMode : FluNavigationView.Auto
+}

example/global/qmldir

@@ -1,2 +1,3 @@
 singleton ItemsOriginal 1.0 ItemsOriginal.qml
 singleton ItemsFooter 1.0 ItemsFooter.qml
+singleton MainEvent 1.0 MainEvent.qml

example/lang/En.cpp

@@ -0,0 +1,22 @@
+#include "En.h"
+
+En::En(QObject *parent)
+    : Lang{parent}
+{
+    setObjectName("En");
+    home("Home");
+    basic_input("Basic Input");
+    form("Form");
+    surface("Surfaces");
+    popus("Popus");
+    navigation("Navigation");
+    theming("Theming");
+    media("Media");
+    dark_mode("Dark Mode");
+    sys_dark_mode("Sync with system");
+    search("Search");
+    about("About");
+    settings("Settings");
+    locale("Locale");
+    navigation_view_display_mode("NavigationView Display Mode");
+}

example/lang/En.h

@@ -0,0 +1,17 @@
+#ifndef EN_H
+#define EN_H
+
+#include <QObject>
+#include "Lang.h"
+
+class En : public Lang
+{
+    Q_OBJECT
+public:
+    explicit En(QObject *parent = nullptr);
+
+signals:
+
+};
+
+#endif // EN_H

example/lang/Lang.cpp

@@ -0,0 +1,7 @@
+#include "Lang.h"
+
+Lang::Lang(QObject *parent)
+    : QObject{parent}
+{
+
+}

example/lang/Lang.h

@@ -0,0 +1,30 @@
+#ifndef LANG_H
+#define LANG_H
+
+#include <QObject>
+#include "stdafx.h"
+
+class Lang : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY_AUTO(QString,home);
+    Q_PROPERTY_AUTO(QString,basic_input);
+    Q_PROPERTY_AUTO(QString,form);
+    Q_PROPERTY_AUTO(QString,surface);
+    Q_PROPERTY_AUTO(QString,popus);
+    Q_PROPERTY_AUTO(QString,navigation);
+    Q_PROPERTY_AUTO(QString,theming);
+    Q_PROPERTY_AUTO(QString,media);
+    Q_PROPERTY_AUTO(QString,dark_mode);
+    Q_PROPERTY_AUTO(QString,sys_dark_mode);
+    Q_PROPERTY_AUTO(QString,search);
+    Q_PROPERTY_AUTO(QString,about);
+    Q_PROPERTY_AUTO(QString,settings);
+    Q_PROPERTY_AUTO(QString,navigation_view_display_mode);
+    Q_PROPERTY_AUTO(QString,locale);
+public:
+    explicit Lang(QObject *parent = nullptr);
+
+};
+
+#endif // LANG_H

example/lang/Zh.cpp

@@ -0,0 +1,22 @@
+#include "Zh.h"
+
+Zh::Zh(QObject *parent)
+    : Lang{parent}
+{
+    setObjectName("Zh");
+    home("首页");
+    basic_input("基本输入");
+    form("表单");
+    surface("表面");
+    popus("弹窗");
+    navigation("导航");
+    theming("主题");
+    media("媒体");
+    dark_mode("夜间模式");
+    sys_dark_mode("跟随系统");
+    search("查找");
+    about("关于");
+    settings("设置");
+    locale("语言环境");
+    navigation_view_display_mode("导航视图显示模式");
+}

example/lang/Zh.h

@@ -0,0 +1,17 @@
+#ifndef ZH_H
+#define ZH_H
+
+#include <QObject>
+#include "Lang.h"
+
+class Zh : public Lang
+{
+    Q_OBJECT
+public:
+    explicit Zh(QObject *parent = nullptr);
+
+signals:
+
+};
+
+#endif // ZH_H

example/main.cpp

@@ -3,35 +3,35 @@
 #include <QQmlContext>
 #include <QDir>
 #include <QQuickWindow>
-#include <QQuickStyle>
 #include <QProcess>
+#include "lang/Lang.h"
+#include "AppInfo.h"
 #include "ChatController.h"
 
-QMap<QString, QVariant> properties(){
-    QMap<QString, QVariant> map;
-    //    map["installHelper"] = QVariant::fromValue(QVariant::fromValue(InstallHelper::getInstance()));
-    return map;
-}
-
 int main(int argc, char *argv[])
 {
-    QCoreApplication::setOrganizationName("ZhuZiChu");
-    QCoreApplication::setOrganizationDomain("https://zhuzichu520.github.io");
-    QCoreApplication::setApplicationName("FluentUI");
-    QQuickStyle::setStyle("Basic");
+    //将样式设置为Basic，不然会导致组件显示异常
+    qputenv("QT_QUICK_CONTROLS_STYLE","Basic");
+    //6.4及以下监听系统深色模式变化
+#ifdef Q_OS_WIN
+    qputenv("QT_QPA_PLATFORM","windows:darkmode=2");
+#endif
+    QGuiApplication::setOrganizationName("ZhuZiChu");
+    QGuiApplication::setOrganizationDomain("https://zhuzichu520.github.io");
+    QGuiApplication::setApplicationName("FluentUI");
+//    QQuickWindow::setGraphicsApi(QSGRendererInterface::Software);
     QGuiApplication app(argc, argv);
+    app.setQuitOnLastWindowClosed(false);
     QQmlApplicationEngine engine;
-
     qmlRegisterType<ChatController>("Controller",1,0,"ChatController");
-
-    QMapIterator<QString, QVariant> iterator(properties());
-    while (iterator.hasNext()) {
-        iterator.next();
-        QString key = iterator.key();
-        QVariant value = iterator.value();
-        engine.rootContext()->setContextProperty(key,value);
-    }
-    engine.rootContext()->setContextProperty("properties",properties());
+    AppInfo* appInfo = new AppInfo();
+    QQmlContext * context = engine.rootContext();
+    Lang* lang = appInfo->lang();
+    context->setContextProperty("lang",lang);
+    QObject::connect(appInfo,&AppInfo::langChanged,&app,[context,appInfo]{
+        context->setContextProperty("lang",appInfo->lang());
+    });
+    context->setContextProperty("appInfo",appInfo);
     const QUrl url(QStringLiteral("qrc:/App.qml"));
     QObject::connect(&engine, &QQmlApplicationEngine::objectCreated,
                      &app, [url](QObject *obj, const QUrl &objUrl) {

example/page/AboutPage.qml

@@ -5,12 +5,15 @@ import FluentUI
 
 FluWindow {
 
-    width: 500
+    id:window
+
+    width: 600
     height: 600
-    minimumWidth: 500
+    minimumWidth: 600
     minimumHeight: 600
-    maximumWidth: 500
+    maximumWidth: 600
     maximumHeight: 600
+    launchMode: FluWindow.SingleTask
 
     title:"关于"
 
@@ -36,7 +39,7 @@ FluWindow {
                 fontStyle: FluText.Title
             }
             FluText{
-                text:"v1.2.2"
+                text:"v%1".arg(appInfo.version)
                 fontStyle: FluText.Body
                 Layout.alignment: Qt.AlignBottom
             }
@@ -57,13 +60,14 @@ FluWindow {
 
         RowLayout{
             spacing: 14
-            Layout.topMargin: 20
             Layout.leftMargin: 15
             FluText{
                 text:"GitHub："
             }
             FluTextButton{
                 id:text_hublink
+                topPadding:0
+                bottomPadding:0
                 text:"https://github.com/zhuzichu520/FluentUI"
                 Layout.alignment: Qt.AlignBottom
                 onClicked: {
@@ -71,13 +75,30 @@ FluWindow {
                 }
             }
         }
+
+        RowLayout{
+            spacing: 14
+            Layout.leftMargin: 15
+            FluText{
+                text:"B站："
+            }
+            FluTextButton{
+                topPadding:0
+                bottomPadding:0
+                text:"https://www.bilibili.com/video/BV1mg4y1M71w/"
+                Layout.alignment: Qt.AlignBottom
+                onClicked: {
+                    Qt.openUrlExternally(text)
+                }
+            }
+        }
+
         RowLayout{
             spacing: 14
-            Layout.topMargin: 20
             Layout.leftMargin: 15
             FluText{
                 id:text_info
-                text:"如果该项目对你有作用，就请点击上方链接给一个免费的star吧！"
+                text:"如果该项目对你有作用，就请点击上方链接给一个免费的star，或者一键三连，谢谢！"
                 ColorAnimation {
                     id: animation
                     target: text_info
@@ -91,5 +112,43 @@ FluWindow {
                 }
             }
         }
+
+        RowLayout{
+            spacing: 14
+            Layout.leftMargin: 15
+            FluText{
+                text:"捐赠："
+            }
+        }
+
+        Item{
+            Layout.preferredWidth: parent.width
+            Layout.preferredHeight: 252
+            Row{
+                anchors.horizontalCenter: parent.horizontalCenter
+                spacing: 60
+                Image{
+                    width: 164.55
+                    height: 224.25
+                    source: "qrc:/res/image/qrcode_wx.jpg"
+                }
+                Image{
+                    width: 162
+                    height: 252
+                    source: "qrc:/res/image/qrcode_zfb.jpg"
+                }
+            }
+        }
+
+        RowLayout{
+            spacing: 14
+            Layout.leftMargin: 15
+            FluText{
+                id:text_desc
+                text:"个人开发，维护不易，你们的捐赠就是我继续更新的动力！\n有什么问题提Issues，只要时间充足我就会解决的！！"
+            }
+        }
+
+
     }
 }

example/page/LoginPage.qml

@@ -12,8 +12,6 @@ FluWindow {
     minimumHeight: 400
     maximumWidth: 400
     maximumHeight: 400
-    modality:2
-
     title:"登录"
 
     onInitArgument:

example/page/MainPage.qml

@@ -2,22 +2,73 @@
 import QtQuick.Window
 import QtQuick.Controls
 import QtQuick.Layouts
-import "qrc:///global/"
+import Qt.labs.platform
 import FluentUI
+import "qrc:///global/"
 
 FluWindow {
-    id:rootwindow
+    id:window
     width: 1000
     height: 640
     title: "FluentUI"
+    closeDestory:false
     minimumWidth: 520
     minimumHeight: 460
 
+    closeFunc:function(event){
+        close_app.open()
+        event.accepted = false
+    }
+
     FluAppBar{
         id:appbar
-        z:10
+        z:9
         showDark: true
         width:parent.width
+        darkText: lang.dark_mode
+    }
+
+    SystemTrayIcon {
+        id:system_tray
+        visible: true
+        icon.source: "qrc:/res/image/favicon.ico"
+        tooltip: "FluentUI"
+        menu: Menu {
+            MenuItem {
+                text: "退出"
+                onTriggered: {
+                    window.destoryWindow()
+                    FluApp.closeApp()
+                }
+            }
+        }
+        onActivated:
+            (reason)=>{
+                if(reason === SystemTrayIcon.Trigger){
+                    window.show()
+                    window.raise()
+                    window.requestActivate()
+                }
+            }
+    }
+
+    FluContentDialog{
+        id:close_app
+        title:"退出"
+        message:"确定要退出程序吗？"
+        negativeText:"最小化"
+        buttonFlags: FluContentDialog.NeutralButton | FluContentDialog.NegativeButton | FluContentDialog.PositiveButton
+        onNegativeClicked:{
+            system_tray.showMessage("友情提示","FluentUI已隐藏至托盘,点击托盘可再次激活窗口");
+            window.hide()
+        }
+        positiveText:"退出"
+        neutralText:"取消"
+        onPositiveClicked:{
+            window.destoryWindow()
+            FluApp.closeApp()
+        }
+
     }
 
     FluNavigationView{
@@ -25,15 +76,16 @@ FluWindow {
         anchors.fill: parent
         items: ItemsOriginal
         footerItems:ItemsFooter
+        z:11
+        displayMode:MainEvent.displayMode
         logo: "qrc:/res/image/favicon.ico"
-        z: 11
         title:"FluentUI"
         autoSuggestBox:FluAutoSuggestBox{
             width: 280
             anchors.centerIn: parent
-            iconSource: FluentIcons.Zoom
+            iconSource: FluentIcons.Search
             items: ItemsOriginal.getSearchData()
-            placeholderText: "查找"
+            placeholderText: lang.search
             onItemClicked:
                 (data)=>{
                     ItemsOriginal.startPageByItem(data)
@@ -41,8 +93,8 @@ FluWindow {
         }
         Component.onCompleted: {
             ItemsOriginal.navigationView = nav_view
+            ItemsFooter.navigationView = nav_view
             nav_view.setCurrentIndex(0)
-            nav_view.push("qrc:/T_Home.qml")
         }
     }
 

example/page/SingleInstanceWindow.qml

@@ -0,0 +1,46 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import FluentUI
+
+FluWindow {
+
+    id:window
+
+    width: 500
+    height: 600
+    minimumWidth: 500
+    minimumHeight: 600
+    maximumWidth: 500
+    maximumHeight: 600
+    launchMode: FluWindow.SingleInstance
+
+    title:"SingleInstance"
+
+    FluAppBar{
+        id:appbar
+        title:"SingleInstance"
+        width:parent.width
+    }
+
+    FluTextBox{
+        anchors{
+            top:parent.top
+            topMargin:60
+            horizontalCenter: parent.horizontalCenter
+        }
+    }
+
+    FluText{
+        wrapMode: Text.WrapAnywhere
+        anchors{
+            left: parent.left
+            right: parent.right
+            leftMargin: 20
+            rightMargin: 20
+            verticalCenter: parent.verticalCenter
+        }
+        text:"我是一个SingleInstance模式的窗口，如果我存在，我会销毁之前的窗口，并创建一个新窗口"
+    }
+
+}

example/page/SingleTaskWindow.qml

@@ -0,0 +1,31 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import FluentUI
+
+FluWindow {
+
+    id:window
+
+    width: 500
+    height: 600
+    minimumWidth: 500
+    minimumHeight: 600
+    maximumWidth: 500
+    maximumHeight: 600
+    launchMode: FluWindow.SingleTask
+
+    title:"SingleTask"
+
+    FluAppBar{
+        id:appbar
+        title:"SingleTask"
+        width:parent.width
+    }
+
+    FluText{
+        anchors.centerIn: parent
+        text:"我是一个SingleTask模式的窗口，如果我存在，我就激活窗口"
+    }
+
+}

example/page/StandardWindow.qml

@@ -0,0 +1,31 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import FluentUI
+
+FluWindow {
+
+    id:window
+
+    width: 500
+    height: 600
+    minimumWidth: 500
+    minimumHeight: 600
+    maximumWidth: 500
+    maximumHeight: 600
+    launchMode: FluWindow.Standard
+
+    title:"Standard"
+
+    FluAppBar{
+        id:appbar
+        title:"Standard"
+        width:parent.width
+    }
+
+    FluText{
+        anchors.centerIn: parent
+        text:"我是一个Standard模式的窗口，每次我都会创建一个新的窗口"
+    }
+
+}

example/qml.qrc

@@ -158,5 +158,15 @@
         <file>component/CodeExpander.qml</file>
         <file>T_TableView.qml</file>
         <file>T_StatusView.qml</file>
+        <file>T_Settings.qml</file>
+        <file>global/MainEvent.qml</file>
+        <file>res/svg/home.svg</file>
+        <file>res/svg/home_dark.svg</file>
+        <file>page/StandardWindow.qml</file>
+        <file>page/SingleTaskWindow.qml</file>
+        <file>page/SingleInstanceWindow.qml</file>
+        <file>T_RatingControl.qml</file>
+        <file>res/image/qrcode_wx.jpg</file>
+        <file>res/image/qrcode_zfb.jpg</file>
     </qresource>
 </RCC>

example/res/svg/home.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1681271578882" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3664" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M923.733333 394.666667c-85.333333-70.4-206.933333-174.933333-362.666666-309.333334C533.333333 61.866667 490.666667 61.866667 462.933333 85.333333c-155.733333 134.4-277.333333 238.933333-362.666666 309.333334-14.933333 14.933333-25.6 34.133333-25.6 53.333333 0 38.4 32 70.4 70.4 70.4H192v358.4c0 29.866667 23.466667 53.333333 53.333333 53.333333H405.333333c29.866667 0 53.333333-23.466667 53.333334-53.333333v-206.933333h106.666666v206.933333c0 29.866667 23.466667 53.333333 53.333334 53.333333h160c29.866667 0 53.333333-23.466667 53.333333-53.333333V518.4h46.933333c38.4 0 70.4-32 70.4-70.4 0-21.333333-10.666667-40.533333-25.6-53.333333z m-44.8 59.733333h-57.6c-29.866667 0-53.333333 23.466667-53.333333 53.333333v358.4h-138.666667V661.333333c0-29.866667-23.466667-53.333333-53.333333-53.333333h-128c-29.866667 0-53.333333 23.466667-53.333333 53.333333v206.933334H256V507.733333c0-29.866667-23.466667-53.333333-53.333333-53.333333H145.066667c-4.266667 0-6.4-2.133333-6.4-6.4 0-2.133333 2.133333-4.266667 2.133333-6.4 85.333333-70.4 206.933333-174.933333 362.666667-309.333333 4.266667-4.266667 10.666667-4.266667 14.933333 0 155.733333 134.4 277.333333 238.933333 362.666667 309.333333 2.133333 2.133333 2.133333 2.133333 2.133333 4.266667 2.133333 6.4-2.133333 8.533333-4.266667 8.533333z" fill="#2c2c2c" p-id="3665"></path></svg>

example/res/svg/home_dark.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1681277986581" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3875" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M923.733333 394.666667c-85.333333-70.4-206.933333-174.933333-362.666666-309.333334C533.333333 61.866667 490.666667 61.866667 462.933333 85.333333c-155.733333 134.4-277.333333 238.933333-362.666666 309.333334-14.933333 14.933333-25.6 34.133333-25.6 53.333333 0 38.4 32 70.4 70.4 70.4H192v358.4c0 29.866667 23.466667 53.333333 53.333333 53.333333H405.333333c29.866667 0 53.333333-23.466667 53.333334-53.333333v-206.933333h106.666666v206.933333c0 29.866667 23.466667 53.333333 53.333334 53.333333h160c29.866667 0 53.333333-23.466667 53.333333-53.333333V518.4h46.933333c38.4 0 70.4-32 70.4-70.4 0-21.333333-10.666667-40.533333-25.6-53.333333z m-44.8 59.733333h-57.6c-29.866667 0-53.333333 23.466667-53.333333 53.333333v358.4h-138.666667V661.333333c0-29.866667-23.466667-53.333333-53.333333-53.333333h-128c-29.866667 0-53.333333 23.466667-53.333333 53.333333v206.933334H256V507.733333c0-29.866667-23.466667-53.333333-53.333333-53.333333H145.066667c-4.266667 0-6.4-2.133333-6.4-6.4 0-2.133333 2.133333-4.266667 2.133333-6.4 85.333333-70.4 206.933333-174.933333 362.666667-309.333333 4.266667-4.266667 10.666667-4.266667 14.933333 0 155.733333 134.4 277.333333 238.933333 362.666667 309.333333 2.133333 2.133333 2.133333 2.133333 2.133333 4.266667 2.133333 6.4-2.133333 8.533333-4.266667 8.533333z" fill="#ffffff" p-id="3876"></path></svg>

src/CMakeLists.txt

@@ -24,6 +24,7 @@ set(TARGET_SOURCES
     FluTheme.cpp
     Fluent.cpp
     FluentUI.cpp
+	NativeEventFilter.cpp
     WindowHelper.cpp
     qml_plugin.cpp
 )
@@ -37,18 +38,12 @@ set(TARGET_HEADERS
     FluTheme.h
     Fluent.h
     FluentUI.h
-    FramelessView.h
+	NativeEventFilter.h 
     WindowHelper.h
     qml_plugin.h
     stdafx.h
 )
 
-if(WIN32)
-    set(TARGET_SOURCES ${TARGET_SOURCES} FramelessView_win.cpp)
-else()
-    set(TARGET_SOURCES ${TARGET_SOURCES} FramelessView_unix.cpp)
-endif()
-
 add_definitions(-DVERSION_IN="1.0.0")
 add_definitions(-DVURI_STR="FluentUI")
 

src/Def.h

@@ -3,6 +3,16 @@
 
 #include <QObject>
 
+namespace Fluent_DarkMode {
+Q_NAMESPACE
+    enum Fluent_DarkModeType {
+        System      = 0x0,
+        Light    = 0x1,
+        Dark     = 0x2,
+    };
+Q_ENUMS(Fluent_DarkModeType);
+}
+
 namespace Fluent_Awesome {
 Q_NAMESPACE
 enum class Fluent_AwesomeType {

src/FluApp.cpp

@@ -7,8 +7,20 @@
 #include <QTimer>
 #include <QUuid>
 #include <QClipboard>
+#include "FluTheme.h"
 #include "Def.h"
 
+#ifdef Q_OS_WIN
+#include <dwmapi.h>
+#include <Windows.h>
+#include <windowsx.h>
+static bool isCompositionEnabled()
+{
+    BOOL composition_enabled = FALSE;
+    bool success = ::DwmIsCompositionEnabled(&composition_enabled) == S_OK;
+    return composition_enabled && success;
+}
+#endif
 
 FluApp* FluApp::m_instance = nullptr;
 
@@ -25,12 +37,16 @@ FluApp::FluApp(QObject *parent)
 {
 }
 
-void FluApp::init(QWindow *window,QMap<QString, QVariant> properties){
+void FluApp::init(QQuickWindow *window){
     this->appWindow = window;
-    this->properties = properties;
 }
 
 void FluApp::run(){
+#ifdef Q_OS_WIN
+    if(!isCompositionEnabled()){
+        FluTheme::getInstance()->frameless(false);
+    }
+#endif
     navigate(initialRoute());
 }
 
@@ -39,38 +55,45 @@ void FluApp::navigate(const QString& route,const QJsonObject& argument,FluRegist
         qErrnoWarning("没有找到当前路由");
         return;
     }
-    bool isAppWindow = route == initialRoute();
-    FramelessView *view = new FramelessView();
+    QQmlEngine *engine = qmlEngine(appWindow);
+    QQmlComponent component(engine, routes().value(route).toString());
+    QVariantMap properties;
+    properties.insert("route",route);
+    if(fluRegister){
+        properties.insert("pageRegister",QVariant::fromValue(fluRegister));
+    }
+    properties.insert("argument",argument);
+    QQuickWindow *view = qobject_cast<QQuickWindow*>(component.createWithInitialProperties(properties));
+
+    int launchMode = view->property("launchMode").toInt();
+    if(launchMode==1){
+        for (auto& pair : wnds) {
+            QString r =  pair->property("route").toString();
+            if(r == route){
+                pair->requestActivate();
+                view->deleteLater();
+                return;
+            }
+        }
+    }else if(launchMode==2){
+        for (auto& pair : wnds) {
+            QString r =  pair->property("route").toString();
+            if(r == route){
+                pair->close();
+                break;
+            }
+        }
+    }
+
+    if(FluTheme::getInstance()->frameless()){
+        view->setFlag(Qt::FramelessWindowHint,true);
+    }
+    wnds.insert(view->winId(),view);
     if(fluRegister){
         fluRegister->to(view);
-        view->setProperty("pageRegister",QVariant::fromValue(fluRegister));
-    }
-    view->setProperty("argument",argument);
-    QMapIterator<QString, QVariant> iterator(properties);
-    while (iterator.hasNext()) {
-        iterator.next();
-        QString key = iterator.key();
-        QVariant value = iterator.value();
-        view->engine()->rootContext()->setContextProperty(key,value);
     }
     view->setColor(QColor(Qt::transparent));
-    QObject::connect(view, &QQuickView::statusChanged, view, [&](QQuickView::Status status) {
-        if (status == QQuickView::Status::Ready) {
-            Q_EMIT windowReady(view);
-            view->moveToScreenCenter();
-            view->show();
-        }
-    });
-    view->setSource((routes().value(route).toString()));
-    if(isAppWindow){
-        QObject::connect(view->engine(), &QQmlEngine::quit, qApp, &QCoreApplication::quit);
-    }else{
-        view->closeDeleteLater();
-    }
-}
-
-bool FluApp::equalsWindow(FramelessView *view,QWindow *window){
-    return view->winId() == window->winId();
+    view->show();
 }
 
 QJsonArray FluApp::awesomelist(const QString& keyword)
@@ -104,3 +127,7 @@ void FluApp::clipText(const QString& text){
 QString FluApp::uuid(){
     return QUuid::createUuid().toString();
 }
+
+void FluApp::closeApp(){
+    qApp->exit(0);
+}

src/FluApp.h

@@ -8,7 +8,6 @@
 #include <QJsonObject>
 #include <QQmlEngine>
 #include "FluRegister.h"
-#include "FramelessView.h"
 #include "stdafx.h"
 
 class FluApp : public QObject
@@ -27,11 +26,7 @@ public:
 
     Q_INVOKABLE void navigate(const QString& route,const QJsonObject& argument  = {},FluRegister* fluRegister = nullptr);
 
-    Q_INVOKABLE void init(QWindow *window,QMap<QString, QVariant> properties);
-
-    Q_SIGNAL void windowReady(FramelessView *view);
-
-    Q_INVOKABLE bool equalsWindow(FramelessView *view,QWindow *window);
+    Q_INVOKABLE void init(QQuickWindow *window);
 
     Q_INVOKABLE QJsonArray awesomelist(const QString& keyword = "");
 
@@ -39,11 +34,13 @@ public:
 
     Q_INVOKABLE QString uuid();
 
+    Q_INVOKABLE void closeApp();
+
+public:
+    QMap<quint64, QQuickWindow*> wnds;
 private:
-    QMap<QString, QVariant> properties;
     static FluApp* m_instance;
     QWindow *appWindow;
-
 };
 
 #endif // FLUAPP_H

src/FluRegister.h

@@ -2,15 +2,15 @@
 #define FLUREGISTER_H
 
 #include <QObject>
-#include <FramelessView.h>
+#include <QQuickWindow>
 #include <QJsonObject>
 #include "stdafx.h"
 
 class FluRegister : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY_AUTO(FramelessView*,from)
-    Q_PROPERTY_AUTO(FramelessView*,to)
+    Q_PROPERTY_AUTO(QQuickWindow*,from)
+    Q_PROPERTY_AUTO(QQuickWindow*,to)
     Q_PROPERTY_AUTO(QString,path);
 public:
     explicit FluRegister(QObject *parent = nullptr);

src/FluTheme.cpp

@@ -1,6 +1,9 @@
 #include "FluTheme.h"
 
 #include "FluColors.h"
+#include "Def.h"
+#include <QPalette>
+#include <QGuiApplication>
 
 FluTheme* FluTheme::m_instance = nullptr;
 
@@ -15,9 +18,44 @@ FluTheme *FluTheme::getInstance()
 FluTheme::FluTheme(QObject *parent)
     : QObject{parent}
 {
+    connect(this,&FluTheme::darkModeChanged,this,[=]{
+        Q_EMIT darkChanged();
+    });
     primaryColor(FluColors::getInstance()->Blue());
     textSize(13);
-    nativeText(true);
+    nativeText(false);
     frameless(true);
-    dark(false);
+    darkMode(Fluent_DarkMode::Fluent_DarkModeType::Light);
+    qApp->installEventFilter(this);
+}
+
+bool FluTheme::eventFilter(QObject *obj, QEvent *event)
+{
+    Q_UNUSED(obj);
+    if (event->type() == QEvent::ApplicationPaletteChange)
+    {
+        Q_EMIT darkChanged();
+        event->accept();
+        return true;
+    }
+    return false;
+}
+
+bool FluTheme::systemDark()
+{
+    QPalette palette = qApp->palette();
+    QColor color = palette.color(QPalette::Window).rgb();
+    return !(color.red() * 0.2126 + color.green() * 0.7152 + color.blue() * 0.0722 > 255 / 2);
+}
+
+bool FluTheme::dark(){
+    if(_darkMode == Fluent_DarkMode::Fluent_DarkModeType::Dark){
+        return true;
+    }else if(_darkMode == Fluent_DarkMode::Fluent_DarkModeType::Light){
+        return false;
+    }else if(_darkMode == Fluent_DarkMode::Fluent_DarkModeType::System){
+        return systemDark();
+    }else{
+        return false;
+    }
 }

src/FluTheme.h

@@ -8,17 +8,22 @@
 class FluTheme : public QObject
 {
     Q_OBJECT
+    Q_PROPERTY(bool dark READ dark NOTIFY darkChanged)
     Q_PROPERTY_AUTO(FluColorSet*,primaryColor)
     Q_PROPERTY_AUTO(bool,frameless);
-    Q_PROPERTY_AUTO(bool,dark);
+    Q_PROPERTY_AUTO(int,darkMode);
     Q_PROPERTY_AUTO(bool,nativeText);
     Q_PROPERTY_AUTO(int,textSize);
 public:
     explicit FluTheme(QObject *parent = nullptr);
     static FluTheme *getInstance();
+    bool dark();
+    Q_SIGNAL void darkChanged();
 private:
     static FluTheme* m_instance;
-
+    bool _dark;
+    bool eventFilter(QObject *obj, QEvent *event);
+    bool systemDark();
 };
 
 #endif // FLUTHEME_H

src/Fluent.cpp

@@ -5,6 +5,7 @@
 #include <QGuiApplication>
 #include <QQuickWindow>
 #include "FluColors.h"
+#include "NativeEventFilter.h"
 #include "FluTheme.h"
 #include "WindowHelper.h"
 #include "FluApp.h"
@@ -33,6 +34,7 @@ void Fluent::registerTypes(const char *uri){
     qmlRegisterType<WindowHelper>(uri,major,minor,"WindowHelper");
     qmlRegisterType<FluColorSet>(uri,major,minor,"FluColorSet");
 
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluRatingControl.qml"),uri,major,minor,"FluRatingControl");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluStatusView.qml"),uri,major,minor,"FluStatusView");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluPagination.qml"),uri,major,minor,"FluPagination");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluToggleButton.qml"),uri,major,minor,"FluToggleButton");
@@ -86,15 +88,20 @@ void Fluent::registerTypes(const char *uri){
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluRadioButton.qml"),uri,major,minor,"FluRadioButton");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluSlider.qml"),uri,major,minor,"FluSlider");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluTextBox.qml"),uri,major,minor,"FluTextBox");
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluPasswordBox.qml"),uri,major,minor,"FluPasswordBox");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluText.qml"),uri,major,minor,"FluText");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluFilledButton.qml"),uri,major,minor,"FluFilledButton");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluToggleSwitch.qml"),uri,major,minor,"FluToggleSwitch");
 
     qmlRegisterUncreatableMetaObject(Fluent_Awesome::staticMetaObject,  uri,major,minor,"FluentIcons", "Access to enums & flags only");
+    qmlRegisterUncreatableMetaObject(Fluent_DarkMode::staticMetaObject,  uri,major,minor,"FluDarkMode", "Access to enums & flags only");
+
 }
 
 void Fluent::initializeEngine(QQmlEngine *engine, const char *uri)
 {
+    nativeEvent = new NativeEventFilter();
+    qApp->installNativeEventFilter(nativeEvent);
     Q_UNUSED(engine)
     Q_UNUSED(uri)
 #ifdef Q_OS_WIN

src/Fluent.h

@@ -3,17 +3,25 @@
 
 #include <QObject>
 #include <QQmlEngine>
+#include "NativeEventFilter.h"
 
 class Fluent: public QObject
 {
     Q_OBJECT
 public:
     Q_INVOKABLE QString version() const;
+    ~Fluent(){
+        if (nativeEvent != Q_NULLPTR) {
+               delete nativeEvent;
+               nativeEvent = Q_NULLPTR;
+           }
+    }
     void registerTypes(const char *uri);
     void initializeEngine(QQmlEngine *engine, const char *uri);
     static Fluent *getInstance();
 private:
     static Fluent* m_instance;
+    NativeEventFilter *nativeEvent = Q_NULLPTR;
 };
 
 #endif // FLUENT_H

src/FluentUI.pro

@@ -19,7 +19,7 @@ HEADERS += \
     FluTheme.h \
     Fluent.h \
     FluentUI.h \
-    FramelessView.h \
+    NativeEventFilter.h \
     WindowHelper.h \
     qml_plugin.h \
     stdafx.h
@@ -33,16 +33,12 @@ SOURCES += \
     FluTheme.cpp \
     Fluent.cpp \
     FluentUI.cpp \
+    NativeEventFilter.cpp \
     WindowHelper.cpp \
     qml_plugin.cpp \
 
 win32 {
     LIBS += -ldwmapi -luser32
-    SOURCES += \
-        FramelessView_win.cpp
-} else {
-    SOURCES += \
-        FramelessView_unix.cpp
 }
 
 DEFINES += VERSION_IN=\\\"1.0.0\\\"

src/FramelessView.h

@@ -1,56 +0,0 @@
-#pragma once
-
-#include <QMouseEvent>
-#include <QQuickView>
-#include <QRegion>
-
-class FramelessViewPrivate;
-class FramelessView : public QQuickView
-{
-    Q_OBJECT
-    using Super = QQuickView;
-    Q_PROPERTY(bool isMax READ isMax NOTIFY isMaxChanged)
-    Q_PROPERTY(bool isFull READ isFull NOTIFY isFullChanged)
-public:
-    explicit FramelessView(QWindow *parent = nullptr);
-    ~FramelessView();
-    void moveToScreenCenter();
-    void closeDeleteLater();
-    bool isMax() const;
-    bool isFull() const;
-    QQuickItem *titleItem() const;
-
-    static QMap<WId,FramelessView*> *windowCache;
-    static QRect calcCenterGeo(const QRect &screenGeo, const QSize &normalSize);
-public slots:
-    void setIsMax(bool isMax);
-    void setIsFull(bool isFull);
-    void setTitleItem(QQuickItem* item);
-
-signals:
-    void isMaxChanged(bool isMax);
-    void isFullChanged(bool isFull);
-    void mousePressed(int xPos, int yPos, int button);
-
-protected:
-    void showEvent(QShowEvent *e) override;
-    void resizeEvent(QResizeEvent *e) override;
-    bool event(QEvent *ev) override;
-#    if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    bool nativeEvent(const QByteArray &eventType, void *message, qintptr *result) override;
-#    else
-    bool nativeEvent(const QByteArray &eventType, void *message, long *result) override;
-#    endif
-    void mousePressEvent(QMouseEvent* event) override
-    {
-#    if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-        emit mousePressed(event->position().x(), event->position().y(), event->button());
-#else
-        emit mousePressed(event->x(), event->y(), event->button());
-#endif
-        Super::mousePressEvent(event);
-    }
-
-private:
-    FramelessViewPrivate *d;
-};

src/FramelessView_unix.cpp

@@ -1,138 +0,0 @@
-#include "FramelessView.h"
-#include <QGuiApplication>
-#include <QQuickItem>
-#include <QScreen>
-#include <QWindow>
-#include <FluTheme.h>
-
-class FramelessViewPrivate
-{
-public:
-    bool m_isMax = false;
-    bool m_isFull = false;
-    bool m_deleteLater = false;
-    QQuickItem *m_titleItem = nullptr;
-};
-
-FramelessView::FramelessView(QWindow *parent) : Super(parent), d(new FramelessViewPrivate)
-{
-    if(FluTheme::getInstance()->frameless()){
-        setFlags( Qt::Window | Qt::FramelessWindowHint | Qt::WindowTitleHint | Qt::WindowSystemMenuHint);
-    }
-    setResizeMode(SizeRootObjectToView);
-    setIsMax(windowState() == Qt::WindowMaximized);
-    setIsFull(windowState() == Qt::WindowFullScreen);
-    connect(this, &QWindow::windowStateChanged, this, [&](Qt::WindowState state) {
-        (void)state;
-        setIsMax(windowState() == Qt::WindowMaximized);
-        setIsFull(windowState() == Qt::WindowFullScreen);
-    });
-    connect(FluTheme::getInstance(),&FluTheme::framelessChanged,this,[=](){
-        setFlag(Qt::Window,false);
-        setFlag(Qt::Window,true);
-    });
-}
-
-FramelessView::~FramelessView()
-{
-    delete d;
-}
-
-void FramelessView::showEvent(QShowEvent *e)
-{
-    Super::showEvent(e);
-}
-
-QRect FramelessView::calcCenterGeo(const QRect &screenGeo, const QSize &normalSize)
-{
-    int w = normalSize.width();
-    int h = normalSize.height();
-    int x = screenGeo.x() + (screenGeo.width() - w) / 2;
-    int y = screenGeo.y() + (screenGeo.height() - h) / 2;
-    if (screenGeo.width() < w) {
-        x = screenGeo.x();
-        w = screenGeo.width();
-    }
-    if (screenGeo.height() < h) {
-        y = screenGeo.y();
-        h = screenGeo.height();
-    }
-    return { x, y, w, h };
-}
-
-void FramelessView::moveToScreenCenter()
-{
-    auto geo = calcCenterGeo(screen()->availableGeometry(), size());
-    if (minimumWidth() > geo.width() || minimumHeight() > geo.height()) {
-        setMinimumSize(geo.size());
-    }
-    setGeometry(geo);
-    update();
-}
-
-void FramelessView::closeDeleteLater(){
-    d->m_deleteLater = true;
-}
-
-bool FramelessView::isMax() const
-{
-    return d->m_isMax;
-}
-
-bool FramelessView::isFull() const
-{
-    return d->m_isFull;
-}
-
-QQuickItem *FramelessView::titleItem() const
-{
-    return d->m_titleItem;
-}
-
-void FramelessView::setIsMax(bool isMax)
-{
-    if (d->m_isMax == isMax)
-        return;
-
-    d->m_isMax = isMax;
-    emit isMaxChanged(d->m_isMax);
-}
-
-void FramelessView::setIsFull(bool isFull)
-{
-    if(d->m_isFull == isFull)
-        return;
-
-    d->m_isFull = isFull;
-    emit isFullChanged(d->m_isFull);
-}
-
-void FramelessView::setTitleItem(QQuickItem *item)
-{
-    d->m_titleItem = item;
-}
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-bool FramelessView::nativeEvent(const QByteArray &eventType, void *message, qintptr *result)
-#else
-bool FramelessView::nativeEvent(const QByteArray &eventType, void *message, long *result)
-#endif
-{
-    return Super::nativeEvent(eventType, message, result);
-}
-
-void FramelessView::resizeEvent(QResizeEvent *e)
-{
-    Super::resizeEvent(e);
-}
-
-bool FramelessView::event(QEvent *ev)
-{
-    if (ev->type() == QEvent::Close) {
-        if(d->m_deleteLater){
-            deleteLater();
-            ev->setAccepted(false);
-        }
-    }
-    return QQuickWindow::event(ev);
-}
-

src/FramelessView_win.cpp

@@ -1,268 +0,0 @@
-#include "FramelessView.h"
-#include <QGuiApplication>
-#include <QQuickItem>
-#include <QScreen>
-#include <QWindow>
-#include <FluTheme.h>
-#include <QTimer>
-
-#include <dwmapi.h>
-#include <windowsx.h>
-#pragma comment(lib, "Dwmapi.lib")
-#pragma comment(lib, "User32.lib")
-
-
-static bool isCompositionEnabled()
-{
-    BOOL composition_enabled = FALSE;
-    bool success = ::DwmIsCompositionEnabled(&composition_enabled) == S_OK;
-    return composition_enabled && success;
-}
-
-static bool isMaxWin(QWindow* win)
-{
-    return win->windowState() == Qt::WindowMaximized;
-}
-static bool isFullWin(QQuickView* win)
-{
-    return win->windowState() == Qt::WindowFullScreen;
-}
-static bool isFixWin(QQuickView* win)
-{
-    return win->minimumWidth() ==  win->maximumWidth() && win->minimumHeight() ==  win->maximumHeight();
-}
-static long hitTest(RECT winrect, long x, long y, int borderWidth)
-{
-    if ((x >= winrect.left) && (x < winrect.left + borderWidth) && (y >= winrect.top) && (y < winrect.top + borderWidth))
-    {
-        return HTTOPLEFT;
-    }
-    else if (x < winrect.right && x >= winrect.right - borderWidth && y >= winrect.top && y < winrect.top + borderWidth)
-    {
-        return HTTOPRIGHT;
-    }
-    else if (x >= winrect.left && x < winrect.left + borderWidth && y < winrect.bottom && y >= winrect.bottom - borderWidth)
-    {
-        return HTBOTTOMLEFT;
-    }
-    else if (x < winrect.right && x >= winrect.right - borderWidth && y < winrect.bottom && y >= winrect.bottom - borderWidth)
-    {
-        return HTBOTTOMRIGHT;
-    }
-    else if (x >= winrect.left && x < winrect.left + borderWidth)
-    {
-        return HTLEFT;
-    }
-    else if (x < winrect.right && x >= winrect.right - borderWidth)
-    {
-        return HTRIGHT;
-    }
-    else if (y >= winrect.top && y < winrect.top + borderWidth)
-    {
-        return HTTOP;
-    }
-    else if (y < winrect.bottom && y >= winrect.bottom - borderWidth)
-    {
-        return HTBOTTOM;
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-class FramelessViewPrivate
-{
-public:
-    bool m_isMax = false;
-    bool m_isFull = false;
-    bool m_deleteLater = false;
-    bool m_isFirst = true;
-    QQuickItem *m_titleItem = nullptr;
-};
-
-FramelessView::FramelessView(QWindow *parent) : Super(parent), d(new FramelessViewPrivate)
-{
-    if(!isCompositionEnabled()){
-        FluTheme::getInstance()->frameless(false);
-    }
-    if(FluTheme::getInstance()->frameless()){
-        setFlag(Qt::FramelessWindowHint,true);
-    }
-    setResizeMode(SizeRootObjectToView);
-    setIsMax(windowState() == Qt::WindowMaximized);
-    setIsFull(windowState() == Qt::WindowFullScreen);
-    connect(this, &QWindow::windowStateChanged, this, [=](Qt::WindowState state) {
-        (void)state;
-        setIsMax(windowState() == Qt::WindowMaximized);
-        setIsFull(windowState() == Qt::WindowFullScreen);
-    });
-    connect(FluTheme::getInstance(),&FluTheme::framelessChanged,this,[=](){
-        setFlag(Qt::Window,false);
-        setFlag(Qt::Window,true);
-    });
-}
-
-FramelessView::~FramelessView()
-{
-    delete d;
-}
-
-void FramelessView::showEvent(QShowEvent *e)
-{
-    static const MARGINS shadow_state[2] { { 0, 0, 0, 0 }, { 1, 1, 1, 1 } };
-    ::DwmExtendFrameIntoClientArea((HWND)(winId()), &shadow_state[true]);
-    if(FluTheme::getInstance()->frameless()){
-        setFlag(Qt::FramelessWindowHint,false);
-    }
-    Super::showEvent(e);
-}
-
-QRect FramelessView::calcCenterGeo(const QRect &screenGeo, const QSize &normalSize)
-{
-    int w = normalSize.width();
-    int h = normalSize.height();
-    int x = screenGeo.x() + (screenGeo.width() - w) / 2;
-    int y = screenGeo.y() + (screenGeo.height() - h) / 2;
-    if (screenGeo.width() < w) {
-        x = screenGeo.x();
-        w = screenGeo.width();
-    }
-    if (screenGeo.height() < h) {
-        y = screenGeo.y();
-        h = screenGeo.height();
-    }
-    return { x, y, w, h };
-}
-
-void FramelessView::moveToScreenCenter()
-{
-    auto geo = calcCenterGeo(screen()->availableGeometry(), size());
-    if (minimumWidth() > geo.width() || minimumHeight() > geo.height()) {
-        setMinimumSize(geo.size());
-    }
-    setGeometry(geo);
-    update();
-}
-
-void FramelessView::closeDeleteLater(){
-    d->m_deleteLater = true;
-}
-
-bool FramelessView::isMax() const
-{
-    return d->m_isMax;
-}
-
-bool FramelessView::isFull() const
-{
-    return d->m_isFull;
-}
-
-QQuickItem *FramelessView::titleItem() const
-{
-    return d->m_titleItem;
-}
-
-void FramelessView::setIsMax(bool isMax)
-{
-    if (d->m_isMax == isMax)
-        return;
-
-    d->m_isMax = isMax;
-    emit isMaxChanged(d->m_isMax);
-}
-
-void FramelessView::setIsFull(bool isFull)
-{
-    if(d->m_isFull == isFull)
-        return;
-
-    d->m_isFull = isFull;
-    emit isFullChanged(d->m_isFull);
-}
-
-int count = 1;
-
-void FramelessView::setTitleItem(QQuickItem *item)
-{
-    d->m_titleItem = item;
-}
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-bool FramelessView::nativeEvent(const QByteArray &eventType, void *message, qintptr *result)
-#else
-bool FramelessView::nativeEvent(const QByteArray &eventType, void *message, long *result)
-#endif
-{
-    MSG* msg = static_cast<MSG*>(message);
-    if (!msg || !msg->hwnd)
-    {
-        return false;
-    }
-    if (msg->message == WM_NCHITTEST && FluTheme::getInstance()->frameless())
-    {
-        RECT winrect;
-        GetWindowRect(HWND(winId()), &winrect);
-        long x = GET_X_LPARAM(msg->lParam);
-        long y = GET_Y_LPARAM(msg->lParam);
-        *result = 0;
-        if (!isMaxWin(this) && !isFullWin(this) && !isFixWin(this))
-        {
-            *result = hitTest(winrect, x, y, 4);
-            if (0 != *result)
-            {
-                return true;
-            }
-        }
-    }else if (msg->message == WM_NCCALCSIZE && FluTheme::getInstance()->frameless())
-    {
-        const auto mode = static_cast<BOOL>(msg->wParam);
-        const auto clientRect = mode ? &(reinterpret_cast<LPNCCALCSIZE_PARAMS>(msg->lParam)->rgrc[0]) : reinterpret_cast<LPRECT>(msg->lParam);
-        if (mode == TRUE)
-        {
-            *result = WVR_REDRAW;
-            if (!isMaxWin(this) && !isFullWin(this))
-            {
-                if (clientRect->top != 0)
-                {
-                    clientRect->top -= 0.1;
-                }
-            }
-            else
-            {
-                if (clientRect->top != 0)
-                {
-                    clientRect->top += 0.1;
-                }
-            }
-            return true;
-        }
-    }else if (msg->message == WM_WINDOWPOSCHANGING)
-    {
-        WINDOWPOS* wp = reinterpret_cast<WINDOWPOS*>(msg->lParam);
-        if (wp != nullptr && (wp->flags & SWP_NOSIZE) == 0)
-        {
-            wp->flags |= SWP_NOCOPYBITS;
-            *result = 0;
-            return true;
-        }
-    }
-    return Super::nativeEvent(eventType, message, result);
-}
-
-void FramelessView::resizeEvent(QResizeEvent *e)
-{
-    Super::resizeEvent(e);
-}
-
-bool FramelessView::event(QEvent *ev)
-{
-    if (ev->type() == QEvent::Close) {
-        if(d->m_deleteLater){
-            deleteLater();
-            ev->setAccepted(false);
-        }
-    }
-    return QQuickWindow::event(ev);
-}
-

src/NativeEventFilter.cpp

@@ -0,0 +1,76 @@
+#include "NativeEventFilter.h"
+#include "FluTheme.h"
+#include "FluApp.h"
+#ifdef Q_OS_WIN
+#include <Windows.h>
+#include <windowsx.h>
+#endif
+
+bool NativeEventFilter::nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result)
+{
+#ifdef Q_OS_WIN
+    if (eventType == "windows_generic_MSG" && FluTheme::getInstance()->frameless()) {
+        MSG* msg = static_cast<MSG *>(message);
+        if (msg == Q_NULLPTR)
+            return false;
+        switch(msg->message) {
+        case WM_NCCALCSIZE:{
+            NCCALCSIZE_PARAMS& params = *reinterpret_cast<NCCALCSIZE_PARAMS*>(msg->lParam);
+            if (params.rgrc[0].top != 0)
+                params.rgrc[0].top -= 1;
+            *result = WVR_REDRAW;
+            return true;
+        }
+        case WM_NCHITTEST: {
+            auto view = FluApp::getInstance()->wnds[(WId)msg->hwnd];
+            bool isResize = !(view->maximumWidth()==view->minimumWidth()&&view->maximumHeight()==view->minimumHeight());
+            const LONG borderWidth = 8;
+            RECT winrect;
+            GetWindowRect(msg->hwnd, &winrect);
+            long x = GET_X_LPARAM(msg->lParam);
+            long y = GET_Y_LPARAM(msg->lParam);
+            if (x >= winrect.left && x < winrect.left + borderWidth &&
+                    y < winrect.bottom && y >= winrect.bottom - borderWidth && isResize) {
+                *result = HTBOTTOMLEFT;
+                return true;
+            }
+            if (x < winrect.right && x >= winrect.right - borderWidth &&
+                    y < winrect.bottom && y >= winrect.bottom - borderWidth && isResize) {
+                *result = HTBOTTOMRIGHT;
+                return true;
+            }
+            if (x >= winrect.left && x < winrect.left + borderWidth &&
+                    y >= winrect.top && y < winrect.top + borderWidth && isResize) {
+                *result = HTTOPLEFT;
+                return true;
+            }
+            if (x < winrect.right && x >= winrect.right - borderWidth &&
+                    y >= winrect.top && y < winrect.top + borderWidth && isResize) {
+                *result = HTTOPRIGHT;
+                return true;
+            }
+            if (x >= winrect.left && x < winrect.left + borderWidth && isResize) {
+                *result = HTLEFT;
+                return true;
+            }
+            if (x < winrect.right && x >= winrect.right - borderWidth && isResize) {
+                *result = HTRIGHT;
+                return true;
+            }
+            if (y < winrect.bottom && y >= winrect.bottom - borderWidth && isResize) {
+                *result = HTBOTTOM;
+                return true;
+            }
+            if (y >= winrect.top && y < winrect.top + borderWidth && isResize) {
+                *result = HTTOP;
+                return true;
+            }
+            return false;
+        }
+        default:
+            break;
+        }
+    }
+#endif
+    return false;
+}

src/NativeEventFilter.h

@@ -0,0 +1,14 @@
+#ifndef NATIVEEVENTFILTER_H
+#define NATIVEEVENTFILTER_H
+
+#include <QObject>
+#include <QAbstractNativeEventFilter>
+
+class NativeEventFilter : public QAbstractNativeEventFilter
+{
+
+public:
+    bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override;
+};
+
+#endif // NATIVEEVENTFILTER_H

src/WindowHelper.cpp

@@ -1,6 +1,19 @@
 #include "WindowHelper.h"
 
 #include "FluRegister.h"
+#include "FluApp.h"
+#include "FluTheme.h"
+
+#ifdef Q_OS_WIN
+#include <dwmapi.h>
+#include <Windows.h>
+#include <windowsx.h>
+enum class Style : DWORD
+{
+    windowed = (WS_OVERLAPPEDWINDOW | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_THICKFRAME | WS_CLIPCHILDREN),
+    aero_borderless = (WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_THICKFRAME | WS_CLIPCHILDREN)
+};
+#endif
 
 WindowHelper::WindowHelper(QObject *parent)
     : QObject{parent}
@@ -8,56 +21,38 @@ WindowHelper::WindowHelper(QObject *parent)
 
 }
 
-void WindowHelper::setTitle(const QString& text){
-    window->setTitle(text);
-}
-
-void WindowHelper::initWindow(FramelessView* window){
+void WindowHelper::initWindow(QQuickWindow* window){
     this->window = window;
 }
 
-QJsonObject WindowHelper::getArgument(){
-    return window->property("argument").toJsonObject();
-}
-
-QVariant WindowHelper::getPageRegister(){
-    return window->property("pageRegister");
-}
-
-void WindowHelper::setMinimumWidth(int width){
-    this->window->setMinimumWidth(width);
-}
-void WindowHelper::setMaximumWidth(int width){
-    this->window->setMaximumWidth(width);
-}
-void WindowHelper::setMinimumHeight(int height){
-    this->window->setMinimumHeight(height);
-}
-void WindowHelper::setMaximumHeight(int height){
-    this->window->setMaximumHeight(height);
-}
-void WindowHelper::updateWindow(){
-    this->window->setFlag(Qt::Window,false);
-    this->window->setFlag(Qt::Window,true);
-}
-void WindowHelper::setOpacity(qreal opacity){
-    this->window->setOpacity(opacity);
-}
-void WindowHelper::setModality(int type){
-    if(type == 0){
-        this->window->setModality(Qt::NonModal);
-    }else if(type == 1){
-        this->window->setModality(Qt::WindowModal);
-    }else if(type == 2){
-        this->window->setModality(Qt::ApplicationModal);
-    }else{
-        this->window->setModality(Qt::NonModal);
+void WindowHelper::firstUpdate(){
+    if(isFisrt){
+#ifdef Q_OS_WIN
+        if(FluTheme::getInstance()->frameless()){
+            HWND wnd = (HWND)window->winId();
+            SetWindowLongPtr(wnd, GWL_STYLE, static_cast<LONG>(Style::aero_borderless));
+            const MARGINS shadow_on = { 1, 1, 1, 1 };
+            DwmExtendFrameIntoClientArea(wnd, &shadow_on);
+            SetWindowPos(wnd, Q_NULLPTR, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE);
+            ShowWindow(wnd, SW_SHOW);
+            window->setFlag(Qt::FramelessWindowHint,false);
+        }
+#endif
+        isFisrt = false;
     }
+
 }
 
-QVariant WindowHelper::createRegister(const QString& path){
-    FluRegister *p = new FluRegister(this->window);
-    p->from(this->window);
+QVariant WindowHelper::createRegister(QQuickWindow* window,const QString& path){
+    FluRegister *p = new FluRegister(window);
+    p->from(window);
     p->path(path);
     return  QVariant::fromValue(p);
 }
+
+void WindowHelper::destoryWindow(){
+    if(this->window){
+        FluApp::getInstance()->wnds.remove(this->window->winId());
+        this->window->deleteLater();
+    }
+}

src/WindowHelper.h

@@ -6,7 +6,6 @@
 #include <QQuickItem>
 #include <QWindow>
 #include <QJsonObject>
-#include "FramelessView.h"
 
 class WindowHelper : public QObject
 {
@@ -15,22 +14,15 @@ class WindowHelper : public QObject
 public:
     explicit WindowHelper(QObject *parent = nullptr);
 
-    Q_INVOKABLE void initWindow(FramelessView* window);
-    Q_INVOKABLE void setTitle(const QString& text);
-    Q_INVOKABLE void setMinimumWidth(int width);
-    Q_INVOKABLE void setMaximumWidth(int width);
-    Q_INVOKABLE void setMinimumHeight(int height);
-    Q_INVOKABLE void setMaximumHeight(int height);
-    Q_INVOKABLE QJsonObject getArgument();
-    Q_INVOKABLE QVariant getPageRegister();
-    Q_INVOKABLE void updateWindow();
-    Q_INVOKABLE void setOpacity(qreal opacity);
-    Q_INVOKABLE void setModality(int type);
-    Q_INVOKABLE QVariant createRegister(const QString& path);
+    Q_INVOKABLE void initWindow(QQuickWindow* window);
+    Q_INVOKABLE void destoryWindow();
+    Q_INVOKABLE QVariant createRegister(QQuickWindow* window,const QString& path);
+
+    Q_INVOKABLE void firstUpdate();
 
 private:
-    FramelessView* window;
-
+    QQuickWindow* window;
+    bool isFisrt=true;
 };
 
 #endif // WINDOWHELPER_H

src/colorpicker/content/ColorSlider.qml

@@ -24,6 +24,7 @@ Item {
         y: -Math.round(cursorHeight/2)
         height: parent.height+cursorHeight
         anchors.left: parent.left
+        preventStealing: true
         anchors.right: parent.right
         function handleMouse(mouse) {
             if (mouse.buttons & Qt.LeftButton) {

src/controls/FluAppBar.qml

@@ -67,7 +67,6 @@ Rectangle{
         height: root.height
         spacing: 0
 
-
         RowLayout{
             Layout.alignment: Qt.AlignVCenter
             Layout.rightMargin: 5
@@ -80,7 +79,11 @@ Rectangle{
             FluToggleSwitch{
                 selected: FluTheme.dark
                 clickFunc:function(){
-                    FluTheme.dark = !FluTheme.dark
+                    if(FluTheme.dark){
+                        FluTheme.darkMode = FluDarkMode.Light
+                    }else{
+                        FluTheme.darkMode = FluDarkMode.Dark
+                    }
                 }
             }
         }

src/controls/FluArea.qml

@@ -1,4 +1,5 @@
 import QtQuick
+import QtQuick.Controls
 import FluentUI
 
 Rectangle {

src/controls/FluAutoSuggestBox.qml

@@ -5,6 +5,7 @@ import FluentUI
 FluTextBox{
     property var items:[]
     property string emptyText: "没有找到结果"
+    property int autoSuggestBoxReplacement: FluentIcons.Search
     signal itemClicked(var data)
     signal handleClicked
     QtObject{

src/controls/FluButton.qml

@@ -1,8 +1,9 @@
 import QtQuick
 import QtQuick.Controls
+import QtQuick.Controls.Basic
 import FluentUI
 
-FluControl {
+Button {
 
     property bool disabled: false
     property color normalColor: FluTheme.dark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(254/255,254/255,254/255,1)

src/controls/FluCalendarPicker.qml

@@ -67,21 +67,26 @@ Rectangle {
         modal: true
         dim:false
         enter: Transition {
-            NumberAnimation {
-                property: "y"
-                from:0
-                to:popup.y
-                duration: 150
-            }
+            reversible: true
             NumberAnimation {
                 property: "opacity"
                 from:0
                 to:1
-                duration: 150
+                duration: 83
             }
         }
+
+        exit:Transition {
+            NumberAnimation {
+                property: "opacity"
+                from:1
+                to:0
+                duration: 83
+            }
+        }
+
         contentItem: Item{
-            anchors.fill: parent
+            clip: true
             FluCalendarView{
                 id:container
                 onDateClicked:
@@ -94,15 +99,19 @@ Rectangle {
                     }
             }
         }
-        background: Item{}
+        background: Item{
+            FluShadow{
+                radius: 5
+            }
+        }
         function showPopup() {
             var pos = control.mapToItem(null, 0, 0)
-            if(window.height>pos.y+control.height+popup.height){
+            if(window.height>pos.y+control.height+container.height){
                 popup.y = control.height
-            } else if(pos.y>popup.height){
-                popup.y = -popup.height
+            } else if(pos.y>container.height){
+                popup.y = -container.height
             } else {
-                popup.y = window.height-(pos.y+popup.height)
+                popup.y = window.height-(pos.y+container.height)
             }
             popup.x = -(popup.width-control.width)/2
             popup.open()

src/controls/FluCheckBox.qml

@@ -1,9 +1,10 @@
 import QtQuick
 import QtQuick.Controls
+import QtQuick.Controls.Basic
 import QtQuick.Layouts
 import FluentUI
 
-FluControl {
+Button {
 
     property bool selected: false
     property var clickFunc

src/controls/FluColorPicker.qml

@@ -1,10 +1,11 @@
 import QtQuick
 import QtQuick.Controls
+import QtQuick.Controls.Basic
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
 
-FluControl{
+Button{
     id:control
     width: 36
     height: 36
@@ -33,34 +34,42 @@ FluControl{
         height: container.height
         width: container.width
         contentItem: Item{
-            anchors.fill: parent
+            clip: true
             FluColorView{
                 id:container
             }
         }
-        background:Item{}
-        enter: Transition {
-            NumberAnimation {
-                property: "y"
-                from:0
-                to:popup.y
-                duration: 150
+        background:Item{
+            FluShadow{
+                radius: 5
             }
+        }
+        enter: Transition {
+            reversible: true
             NumberAnimation {
                 property: "opacity"
                 from:0
                 to:1
-                duration: 150
+                duration: 83
+            }
+        }
+
+        exit:Transition {
+            NumberAnimation {
+                property: "opacity"
+                from:1
+                to:0
+                duration: 83
             }
         }
         function showPopup() {
             var pos = control.mapToItem(null, 0, 0)
-            if(window.height>pos.y+control.height+popup.height){
+            if(window.height>pos.y+control.height+container.height){
                 popup.y = control.height
-            } else if(pos.y>popup.height){
-                popup.y = -popup.height
+            } else if(pos.y>container.height){
+                popup.y = -container.height
             } else {
-                popup.y = window.height-(pos.y+popup.height)
+                popup.y = window.height-(pos.y+container.height)
             }
             popup.x = -(popup.width-control.width)/2
             popup.open()

src/controls/FluContentDialog.qml

@@ -7,11 +7,19 @@ Popup {
     id: popup
 
     property string title: "Title"
-    property string message: "Messaeg"
+    property string message: "Message"
+    property string neutralText: "Neutral"
     property string negativeText: "Negative"
     property string positiveText: "Positive"
+    signal neutralClicked
     signal negativeClicked
     signal positiveClicked
+    enum ButtonFlag{
+        NegativeButton=1
+        ,NeutralButton=2
+        ,PositiveButton=4
+    }
+    property int buttonFlags: FluContentDialog.NegativeButton | FluContentDialog.PositiveButton
     property var minWidth: {
         if(Window.window==null)
             return 400
@@ -74,40 +82,48 @@ Popup {
                 right: parent.right
             }
 
-            Item {
-                id:divider
-                width: 1
-                height: parent.height
-                anchors.centerIn: parent
-            }
+            RowLayout{
+                anchors
+                {
+                    centerIn: parent
+                    margins: spacing
+                    fill: parent
+                }
+                spacing: 15
+                FluButton{
+                    id:neutral_btn
+                    Layout.fillWidth: true
+                    Layout.fillHeight: true
+                    visible: popup.buttonFlags&FluContentDialog.NeutralButton
+                    text: neutralText
+                    onClicked: {
+                        popup.close()
+                        neutralClicked()
+                    }
+                }
 
-            FluButton{
-                anchors{
-                    left: parent.left
-                    leftMargin: 20
-                    rightMargin: 10
-                    right: divider.left
-                    verticalCenter: parent.verticalCenter
+                FluButton{
+                    id:negative_btn
+                    Layout.fillWidth: true
+                    Layout.fillHeight: true
+                    visible: popup.buttonFlags&FluContentDialog.NegativeButton
+                    text: negativeText
+                    onClicked: {
+                        popup.close()
+                        negativeClicked()
+                    }
                 }
-                text: negativeText
-                onClicked: {
-                    popup.close()
-                    negativeClicked()
-                }
-            }
 
-            FluFilledButton{
-                anchors{
-                    right: parent.right
-                    left: divider.right
-                    rightMargin: 20
-                    leftMargin: 10
-                    verticalCenter: parent.verticalCenter
-                }
-                text: positiveText
-                onClicked: {
-                    popup.close()
-                    positiveClicked()
+                FluFilledButton{
+                    id:positive_btn
+                    Layout.fillWidth: true
+                    Layout.fillHeight: true
+                    visible: popup.buttonFlags&FluContentDialog.PositiveButton
+                    text: positiveText
+                    onClicked: {
+                        popup.close()
+                        positiveClicked()
+                    }
                 }
             }
         }

src/controls/FluControl.qml

@@ -1,13 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Controls.impl
-import QtQuick.Templates as T
-import FluentUI
-
-T.Button {
-    id: control
-    implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            implicitContentWidth + leftPadding + rightPadding)
-    implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             implicitContentHeight + topPadding + bottomPadding)
-}

src/controls/FluDatePicker.qml

@@ -100,240 +100,252 @@ Rectangle {
     Menu{
         id:popup
         modal: true
-        width: 300
-        height: 340
+        width: container.width
+        height: container.height
         dim:false
         enter: Transition {
-            NumberAnimation {
-                property: "y"
-                from:0
-                to:popup.y
-                duration: 150
-            }
+            reversible: true
             NumberAnimation {
                 property: "opacity"
                 from:0
                 to:1
-                duration: 150
+                duration: 83
             }
         }
-        background:Item{}
-        contentItem: Rectangle{
-            id:container
-            radius: 4
-            anchors.fill: parent
-            color: FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(248/255,250/255,253/255,1)
-            MouseArea{
-                anchors.fill: parent
+
+        exit:Transition {
+            NumberAnimation {
+                property: "opacity"
+                from:1
+                to:0
+                duration: 83
             }
+        }
+        background:Item{
             FluShadow{
                 radius: 4
             }
+        }
+        contentItem: Item{
+            clip: true
+            Rectangle{
+                id:container
+                radius: 4
+                width: 300
+                height: 340
+                color: FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(248/255,250/255,253/255,1)
+                MouseArea{
+                    anchors.fill: parent
+                }
+                FluShadow{
+                    radius: 4
+                }
 
-            RowLayout{
-                id:layout_content
-                spacing: 0
-                width: parent.width
-                height: 300
+                RowLayout{
+                    id:layout_content
+                    spacing: 0
+                    width: parent.width
+                    height: 300
 
-                Component{
-                    id:list_delegate
+                    Component{
+                        id:list_delegate
 
-                    Item{
-                        height:38
-                        width:getListView().width
+                        Item{
+                            height:38
+                            width:getListView().width
 
-                        function getListView(){
-                            if(type === 0)
-                                return list_view_1
-                            if(type === 1)
-                                return list_view_2
-                            if(type === 2)
-                                return list_view_3
-                        }
-
-
-                        Rectangle{
-                            anchors.fill: parent
-                            anchors.topMargin: 2
-                            anchors.bottomMargin: 2
-                            anchors.leftMargin: 5
-                            anchors.rightMargin: 5
-                            color:  {
-                                if(getListView().currentIndex === position){
-                                    if(FluTheme.dark){
-                                        return  item_mouse.containsMouse ? Qt.darker(FluTheme.primaryColor.lighter,1.1) : FluTheme.primaryColor.lighter
-                                    }else{
-                                        return  item_mouse.containsMouse ? Qt.lighter(FluTheme.primaryColor.dark,1.1): FluTheme.primaryColor.dark
-                                    }
-                                }
-                                if(item_mouse.containsMouse){
-                                    return FluTheme.dark ? Qt.rgba(63/255,60/255,61/255,1) : Qt.rgba(237/255,237/255,242/255,1)
-                                }
-                                return FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(0,0,0,0)
+                            function getListView(){
+                                if(type === 0)
+                                    return list_view_1
+                                if(type === 1)
+                                    return list_view_2
+                                if(type === 2)
+                                    return list_view_3
                             }
-                            radius: 3
-                            MouseArea{
-                                id:item_mouse
+
+
+                            Rectangle{
                                 anchors.fill: parent
-                                hoverEnabled: true
-                                onClicked: {
-                                    getListView().currentIndex = position
-                                    if(type === 0){
-                                        text_year.text = model
-                                        list_view_2.model = generateMonthArray(1,12)
-                                        text_month.text = list_view_2.model[list_view_2.currentIndex]
-
-                                        list_view_3.model = generateMonthDaysArray(list_view_1.model[list_view_1.currentIndex],list_view_2.model[list_view_2.currentIndex])
-                                        text_day.text = list_view_3.model[list_view_3.currentIndex]
-                                    }
-                                    if(type === 1){
-                                        text_month.text = model
-                                        list_view_3.model = generateMonthDaysArray(list_view_1.model[list_view_1.currentIndex],list_view_2.model[list_view_2.currentIndex])
-                                        text_day.text = list_view_3.model[list_view_3.currentIndex]
-
-                                    }
-                                    if(type === 2){
-                                        text_day.text = model
-                                    }
-                                }
-                            }
-                            FluText{
-                                text:model
-                                color: {
+                                anchors.topMargin: 2
+                                anchors.bottomMargin: 2
+                                anchors.leftMargin: 5
+                                anchors.rightMargin: 5
+                                color:  {
                                     if(getListView().currentIndex === position){
                                         if(FluTheme.dark){
-                                            return Qt.rgba(0,0,0,1)
+                                            return  item_mouse.containsMouse ? Qt.darker(FluTheme.primaryColor.lighter,1.1) : FluTheme.primaryColor.lighter
                                         }else{
-                                            return Qt.rgba(1,1,1,1)
+                                            return  item_mouse.containsMouse ? Qt.lighter(FluTheme.primaryColor.dark,1.1): FluTheme.primaryColor.dark
+                                        }
+                                    }
+                                    if(item_mouse.containsMouse){
+                                        return FluTheme.dark ? Qt.rgba(63/255,60/255,61/255,1) : Qt.rgba(237/255,237/255,242/255,1)
+                                    }
+                                    return FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(0,0,0,0)
+                                }
+                                radius: 3
+                                MouseArea{
+                                    id:item_mouse
+                                    anchors.fill: parent
+                                    hoverEnabled: true
+                                    onClicked: {
+                                        getListView().currentIndex = position
+                                        if(type === 0){
+                                            text_year.text = model
+                                            list_view_2.model = generateMonthArray(1,12)
+                                            text_month.text = list_view_2.model[list_view_2.currentIndex]
+
+                                            list_view_3.model = generateMonthDaysArray(list_view_1.model[list_view_1.currentIndex],list_view_2.model[list_view_2.currentIndex])
+                                            text_day.text = list_view_3.model[list_view_3.currentIndex]
+                                        }
+                                        if(type === 1){
+                                            text_month.text = model
+                                            list_view_3.model = generateMonthDaysArray(list_view_1.model[list_view_1.currentIndex],list_view_2.model[list_view_2.currentIndex])
+                                            text_day.text = list_view_3.model[list_view_3.currentIndex]
+
+                                        }
+                                        if(type === 2){
+                                            text_day.text = model
                                         }
-                                    }else{
-                                        return FluTheme.dark ? "#FFFFFF" : "#1A1A1A"
                                     }
                                 }
-                                anchors.centerIn: parent
+                                FluText{
+                                    text:model
+                                    color: {
+                                        if(getListView().currentIndex === position){
+                                            if(FluTheme.dark){
+                                                return Qt.rgba(0,0,0,1)
+                                            }else{
+                                                return Qt.rgba(1,1,1,1)
+                                            }
+                                        }else{
+                                            return FluTheme.dark ? "#FFFFFF" : "#1A1A1A"
+                                        }
+                                    }
+                                    anchors.centerIn: parent
+                                }
                             }
                         }
                     }
+
+                    ListView{
+                        id:list_view_1
+                        width: 100
+                        height: parent.height
+                        boundsBehavior:Flickable.StopAtBounds
+                        ScrollBar.vertical: FluScrollBar {}
+                        model: generateYearArray(1924,2048)
+                        clip: true
+                        preferredHighlightBegin: 0
+                        preferredHighlightEnd: 0
+                        highlightMoveDuration: 0
+                        visible: showYear
+                        delegate: Loader{
+                            property var model: modelData
+                            property int type:0
+                            property int position:index
+                            sourceComponent: list_delegate
+                        }
+                    }
+                    Rectangle{
+                        width: 1
+                        height: parent.height
+                        color: dividerColor
+                    }
+                    ListView{
+                        id:list_view_2
+                        width: showYear ? 100 : 150
+                        height: parent.height
+                        clip: true
+                        ScrollBar.vertical: FluScrollBar {}
+                        preferredHighlightBegin: 0
+                        preferredHighlightEnd: 0
+                        highlightMoveDuration: 0
+                        boundsBehavior:Flickable.StopAtBounds
+                        delegate: Loader{
+                            property var model: modelData
+                            property int type:1
+                            property int position:index
+                            sourceComponent: list_delegate
+                        }
+                    }
+                    Rectangle{
+                        width: 1
+                        height: parent.height
+                        color: dividerColor
+                    }
+                    ListView{
+                        id:list_view_3
+                        width:  showYear ? 100 : 150
+                        height: parent.height
+                        clip: true
+                        preferredHighlightBegin: 0
+                        preferredHighlightEnd: 0
+                        highlightMoveDuration: 0
+                        ScrollBar.vertical: FluScrollBar {}
+                        Layout.alignment: Qt.AlignVCenter
+                        boundsBehavior:Flickable.StopAtBounds
+                        delegate: Loader{
+                            property var model: modelData
+                            property int type:2
+                            property int position:index
+                            sourceComponent: list_delegate
+                        }
+                    }
                 }
 
-                ListView{
-                    id:list_view_1
-                    width: 100
-                    height: parent.height
-                    boundsBehavior:Flickable.StopAtBounds
-                    ScrollBar.vertical: FluScrollBar {}
-                    model: generateYearArray(1924,2048)
-                    clip: true
-                    preferredHighlightBegin: 0
-                    preferredHighlightEnd: 0
-                    highlightMoveDuration: 0
-                    visible: showYear
-                    delegate: Loader{
-                        property var model: modelData
-                        property int type:0
-                        property int position:index
-                        sourceComponent: list_delegate
-                    }
-                }
                 Rectangle{
-                    width: 1
-                    height: parent.height
+                    width: parent.width
+                    height: 1
+                    anchors.top: layout_content.bottom
                     color: dividerColor
                 }
-                ListView{
-                    id:list_view_2
-                    width: showYear ? 100 : 150
-                    height: parent.height
-                    clip: true
-                    ScrollBar.vertical: FluScrollBar {}
-                    preferredHighlightBegin: 0
-                    preferredHighlightEnd: 0
-                    highlightMoveDuration: 0
-                    boundsBehavior:Flickable.StopAtBounds
-                    delegate: Loader{
-                        property var model: modelData
-                        property int type:1
-                        property int position:index
-                        sourceComponent: list_delegate
-                    }
-                }
+
                 Rectangle{
-                    width: 1
-                    height: parent.height
-                    color: dividerColor
-                }
-                ListView{
-                    id:list_view_3
-                    width:  showYear ? 100 : 150
-                    height: parent.height
-                    clip: true
-                    preferredHighlightBegin: 0
-                    preferredHighlightEnd: 0
-                    highlightMoveDuration: 0
-                    ScrollBar.vertical: FluScrollBar {}
-                    Layout.alignment: Qt.AlignVCenter
-                    boundsBehavior:Flickable.StopAtBounds
-                    delegate: Loader{
-                        property var model: modelData
-                        property int type:2
-                        property int position:index
-                        sourceComponent: list_delegate
-                    }
-                }
-            }
-
-            Rectangle{
-                width: parent.width
-                height: 1
-                anchors.top: layout_content.bottom
-                color: dividerColor
-            }
-
-            Rectangle{
-                id:layout_actions
-                height: 40
-                radius: 5
-                color: FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
-                anchors{
-                    bottom:parent.bottom
-                    left: parent.left
-                    right: parent.right
-                }
-
-                Item {
-                    id:divider
-                    width: 1
-                    height: parent.height
-                    anchors.centerIn: parent
-                }
-
-                FluButton{
+                    id:layout_actions
+                    height: 40
+                    radius: 5
+                    color: FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
                     anchors{
+                        bottom:parent.bottom
                         left: parent.left
-                        leftMargin: 20
-                        rightMargin: 10
-                        right: divider.left
-                        verticalCenter: parent.verticalCenter
-                    }
-                    text: "取消"
-                    onClicked: {
-                        popup.close()
-                    }
-                }
-
-                FluFilledButton{
-                    anchors{
                         right: parent.right
-                        left: divider.right
-                        rightMargin: 20
-                        leftMargin: 10
-                        verticalCenter: parent.verticalCenter
                     }
-                    text: "确定"
-                    onClicked: {
-                        changeFlag = false
-                        popup.close()
+
+                    Item {
+                        id:divider
+                        width: 1
+                        height: parent.height
+                        anchors.centerIn: parent
+                    }
+
+                    FluButton{
+                        anchors{
+                            left: parent.left
+                            leftMargin: 20
+                            rightMargin: 10
+                            right: divider.left
+                            verticalCenter: parent.verticalCenter
+                        }
+                        text: "取消"
+                        onClicked: {
+                            popup.close()
+                        }
+                    }
+
+                    FluFilledButton{
+                        anchors{
+                            right: parent.right
+                            left: divider.right
+                            rightMargin: 20
+                            leftMargin: 10
+                            verticalCenter: parent.verticalCenter
+                        }
+                        text: "确定"
+                        onClicked: {
+                            changeFlag = false
+                            popup.close()
+                        }
                     }
                 }
             }
@@ -362,12 +374,12 @@ Rectangle {
             text_day.text = day
 
             var pos = root.mapToItem(null, 0, 0)
-            if(window.height>pos.y+root.height+popup.height){
+            if(window.height>pos.y+root.height+container.height){
                 popup.y = root.height
-            } else if(pos.y>popup.height){
-                popup.y = -popup.height
+            } else if(pos.y>container.height){
+                popup.y = -container.height
             } else {
-                popup.y = window.height-(pos.y+popup.height)
+                popup.y = window.height-(pos.y+container.height)
             }
             popup.open()
         }

src/controls/FluDropDownButton.qml

@@ -1,9 +1,10 @@
 import QtQuick
 import QtQuick.Controls
+import QtQuick.Controls.Basic
 import QtQuick.Window
 import FluentUI
 
-FluControl {
+Button {
 
     property bool disabled: false
     property color normalColor: FluTheme.dark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(254/255,254/255,254/255,1)
@@ -76,12 +77,13 @@ FluControl {
 
     onClicked: {
         var pos = control.mapToItem(null, 0, 0)
-        if(window.height>pos.y+control.height+menu.height){
+        var containerHeight = menu.getContainerHeight()
+        if(window.height>pos.y+control.height+containerHeight){
             menu.y = control.height
-        }else if(pos.y>menu.height){
-            menu.y = -menu.height
+        }else if(pos.y>containerHeight){
+            menu.y = -containerHeight
         }else{
-            menu.y = window.height-(pos.y+menu.height)
+            menu.y = window.height-(pos.y+containerHeight)
         }
         menu.open()
     }

src/controls/FluExpander.qml

@@ -48,7 +48,7 @@ Item {
                 rightMargin: 15
             }
             color:{
-                if(root_mouse.containsMouse){
+                if(root_mouse.containsMouse || hovered){
                     return FluTheme.dark ? Qt.rgba(73/255,73/255,73/255,1) : Qt.rgba(245/255,245/255,245/255,1)
                 }
                 return FluTheme.dark ? Qt.rgba(0,0,0,0) : Qt.rgba(0,0,0,0)
@@ -76,6 +76,7 @@ Item {
         clip: true
         anchors{
             top: layout_header.bottom
+            topMargin: -1
             left: layout_header.left
         }
         radius: 4
@@ -84,7 +85,9 @@ Item {
         height: expand ? contentHeight : 0
         Behavior on height {
             NumberAnimation{
-                duration: 150
+                duration: 167
+                easing.type: Easing.BezierSpline
+                easing.bezierCurve: expand ? [ 0, 0, 0, 1 ] : [ 1, 0, 0, 0 ]
             }
         }
     }

src/controls/FluFilledButton.qml

@@ -1,8 +1,9 @@
 import QtQuick
 import QtQuick.Controls
+import QtQuick.Controls.Basic
 import FluentUI
 
-FluControl {
+Button {
 
     property bool disabled: false
     property color normalColor: FluTheme.dark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark

src/controls/FluFlipView.qml

@@ -1,5 +1,6 @@
 import QtQuick
 import QtQuick.Controls
+import QtQuick.Controls.Basic
 import FluentUI
 
 Item{
@@ -52,7 +53,7 @@ Item{
         anchors.fill: parent
     }
 
-    FluControl{
+    Button{
         id:btn_start
         height: vertical ? 20 : 40
         width: vertical ? 40 : 20
@@ -82,7 +83,7 @@ Item{
         }
     }
 
-    FluControl{
+    Button{
         id:btn_end
         height: vertical ? 20 : 40
         width: vertical ? 40 : 20

src/controls/FluIconButton.qml

@@ -1,8 +1,9 @@
 import QtQuick
 import QtQuick.Controls
+import QtQuick.Controls.Basic
 import FluentUI
 
-FluControl {
+Button {
 
     property int iconSize: 20
     property int iconSource
@@ -38,6 +39,7 @@ FluControl {
     id:control
     width: 30
     height: 30
+    clip: true
     implicitWidth: width
     implicitHeight: height
     padding: 0

src/controls/FluMenu.qml

@@ -12,38 +12,50 @@ Menu {
     modal:true
     dim:false
     enter: Transition {
-        NumberAnimation {
-            property: "y"
-            from:0
-            to:popup.y
-            duration: animEnabled ? 150 : 0
-        }
+        reversible: true
         NumberAnimation {
             property: "opacity"
             from:0
             to:1
-            duration: animEnabled ? 150 : 0
+            duration: 83
+        }
+    }
+
+    exit:Transition {
+        NumberAnimation {
+            property: "opacity"
+            from:1
+            to:0
+            duration: 83
+        }
+    }
+
+    background:Item{
+        FluShadow{
+            radius: 5
         }
     }
-    background:Item{}
     contentItem: Item {
+        clip: true
         Rectangle{
             anchors.fill: parent
             color:FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,0.97) : Qt.rgba(237/255,237/255,237/255,0.97)
             radius: 5
         }
-        FluShadow{
-            radius: 5
-        }
         Column{
+            id:container
             spacing: 5
             topPadding: 5
             bottomPadding: 5
             width: popup.width
-            id:container
             function closePopup(){
                 popup.close()
             }
         }
     }
+
+    function getContainerHeight(){
+        return container.height
+    }
+
 }

src/controls/FluMultilineTextBox.qml

@@ -1,8 +1,9 @@
 import QtQuick
 import QtQuick.Controls
+import QtQuick.Controls.Basic
 import FluentUI
 
-FluTextArea{
+TextArea{
 
     property int fontStyle: FluText.Body
     property int pixelSize : FluTheme.textSize

src/controls/FluNavigationView.qml

@@ -1,53 +1,118 @@
 import QtQuick
 import QtQuick.Window
 import QtQuick.Controls
+import QtQuick.Controls.Basic
 import QtQuick.Layouts
 import FluentUI
 
 Item {
 
-    property alias logo : image_logo.source
-    property string title: ""
-    property FluObject items
-    property FluObject footerItems
-    property int displayMode: width<=700 ? FluNavigationView.Minimal : FluNavigationView.Open
-    property bool displaMinimalMenu : false
-    property Component  autoSuggestBox
-
-    id:root
-
-    onDisplayModeChanged: {
-        if(displayMode === FluNavigationView.Minimal){
-            anim_navi.enabled = false
-            displaMinimalMenu = false
-            timer_anim_enable.restart()
-        }
-    }
-
-    Timer{
-        id:timer_anim_enable
-        interval: 150
-        onTriggered: {
-            anim_navi.enabled = true
-        }
-    }
-
     enum DisplayMode {
-        Minimal,
         Open,
+        Compact,
+        Minimal,
         Auto
     }
 
+    property url logo
+    property string title: ""
+    property FluObject items
+    property FluObject footerItems
+    property int displayMode: FluNavigationView.Auto
+    property Component  autoSuggestBox
     property var window : {
         if(Window.window == null)
             return null
         return Window.window
     }
 
+    id:control
+
+    QtObject{
+        id:d
+        property bool enableStack: true
+        property int displayMode: {
+            if(control.displayMode !==FluNavigationView.Auto){
+                return control.displayMode
+            }
+            if(control.width<=700){
+                return FluNavigationView.Minimal
+            }else if(control.width<=900){
+                return FluNavigationView.Compact
+            }else{
+                return FluNavigationView.Open
+            }
+        }
+        property var stackItems: []
+        property bool enableNavigationPanel: false
+        property bool isCompact: d.displayMode === FluNavigationView.Compact
+        property bool isMinimal: d.displayMode === FluNavigationView.Minimal
+        property bool isCompactAndPanel: d.displayMode === FluNavigationView.Compact && d.enableNavigationPanel
+        property bool isCompactAndNotPanel:d.displayMode === FluNavigationView.Compact && !d.enableNavigationPanel
+        property bool isMinimalAndPanel: d.displayMode === FluNavigationView.Minimal && d.enableNavigationPanel
+
+        onIsCompactAndNotPanelChanged: {
+            collapseAll()
+        }
+
+        onDisplayModeChanged: {
+            if(d.displayMode === FluNavigationView.Compact){
+                collapseAll()
+            }
+            if(d.displayMode === FluNavigationView.Minimal){
+                anim_layout_list_x.enabled = false
+                d.enableNavigationPanel = false
+                timer_anim_x_enable.restart()
+            }
+        }
+
+        function handleItems(){
+            var idx = 0
+            var data = []
+            if(items){
+                for(var i=0;i<items.children.length;i++){
+                    var item = items.children[i]
+                    item.idx = idx
+                    data.push(item)
+                    idx++
+                    if(item instanceof FluPaneItemExpander){
+                        for(var j=0;j<item.children.length;j++){
+                            var itemChild = item.children[j]
+                            itemChild.parent = item
+                            itemChild.idx = idx
+                            data.push(itemChild)
+                            idx++
+                        }
+                    }
+                }
+                if(footerItems){
+                    var comEmpty = Qt.createComponent("FluPaneItemEmpty.qml");
+                    for(var k=0;k<footerItems.children.length;k++){
+                        var itemFooter = footerItems.children[k]
+                        if (comEmpty.status === Component.Ready) {
+                            var objEmpty = comEmpty.createObject(items,{idx:idx});
+                            itemFooter.idx = idx;
+                            data.push(objEmpty)
+                            idx++
+                        }
+                    }
+                }
+            }
+            return data
+        }
+    }
+
+    Component{
+        id:com_panel_item_empty
+        Item{
+            visible: false
+        }
+    }
+
     Component{
         id:com_panel_item_separatorr
         FluDivider{
-            width: nav_list.width
+            width: layout_list.width
             height: {
                 if(model.parent){
                     return model.parent.isExpand ? 1 : 0
@@ -56,7 +121,9 @@ Item {
             }
             Behavior on height {
                 NumberAnimation{
-                    duration: 150
+                    duration: 167
+                    easing.type: Easing.BezierSpline
+                    easing.bezierCurve: [ 0, 0, 0, 1 ]
                 }
             }
         }
@@ -73,10 +140,12 @@ Item {
             }
             Behavior on height {
                 NumberAnimation{
-                    duration: 150
+                    duration: 167
+                    easing.type: Easing.BezierSpline
+                    easing.bezierCurve: [ 0, 0, 0, 1 ]
                 }
             }
-            width: nav_list.width
+            width: layout_list.width
             FluText{
                 text:model.title
                 fontStyle: FluText.BodyStrong
@@ -93,8 +162,7 @@ Item {
         id:com_panel_item_expander
         Item{
             height: 38
-            width: nav_list.width
-
+            width: layout_list.width
             Rectangle{
                 radius: 4
                 anchors{
@@ -134,9 +202,21 @@ Item {
                         right: parent.right
                         rightMargin: 12
                     }
+                    opacity: {
+                        if(d.isCompactAndNotPanel){
+                            return false
+                        }
+                        return true
+                    }
+                    visible:opacity
+                    Behavior on opacity {
+                        NumberAnimation{
+                            duration: 83
+                        }
+                    }
                     Behavior on rotation {
                         NumberAnimation{
-                            duration: 150
+                            duration: 83
                         }
                     }
                 }
@@ -145,12 +225,16 @@ Item {
                     hoverEnabled: true
                     anchors.fill: parent
                     onClicked: {
+                        if(d.isCompactAndNotPanel){
+                            control_popup.showPopup(Qt.point(50,mapToItem(control,0,0).y),model.children)
+                            return
+                        }
                         model.isExpand = !model.isExpand
                     }
                 }
                 color: {
                     if(FluTheme.dark){
-                        if((nav_list.currentIndex === position)&&type===0){
+                        if((nav_list.currentIndex === idx)&&type===0){
                             return Qt.rgba(1,1,1,0.06)
                         }
                         if(item_mouse.containsMouse){
@@ -158,7 +242,7 @@ Item {
                         }
                         return Qt.rgba(0,0,0,0)
                     }else{
-                        if(nav_list.currentIndex === position&&type===0){
+                        if(nav_list.currentIndex === idx&&type===0){
                             return Qt.rgba(0,0,0,0.06)
                         }
                         if(item_mouse.containsMouse){
@@ -167,28 +251,53 @@ Item {
                         return Qt.rgba(0,0,0,0)
                     }
                 }
-
-                FluIcon{
-                    id:item_icon
-                    iconSource: {
-                        if(model.icon){
-                            return model.icon
+                Component{
+                    id:com_icon
+                    FluIcon{
+                        iconSource: {
+                            if(model.icon){
+                                return model.icon
+                            }
+                            return 0
                         }
-                        return 0
+                        iconSize: 15
                     }
+                }
+
+                Item{
+                    id:item_icon
                     width: 30
                     height: 30
-                    iconSize: 15
                     anchors{
                         verticalCenter: parent.verticalCenter
                         left:parent.left
                         leftMargin: 3
                     }
+                    Loader{
+                        anchors.centerIn: parent
+                        sourceComponent: {
+                            if(model.cusIcon){
+                                return model.cusIcon
+                            }
+                            return com_icon
+                        }
+                    }
                 }
-
                 FluText{
                     id:item_title
                     text:model.title
+                    opacity: {
+                        if(d.isCompactAndNotPanel){
+                            return false
+                        }
+                        return true
+                    }
+                    visible:opacity
+                    Behavior on opacity {
+                        NumberAnimation{
+                            duration: 83
+                        }
+                    }
                     anchors{
                         verticalCenter: parent.verticalCenter
                         left:item_icon.right
@@ -209,7 +318,9 @@ Item {
         Item{
             Behavior on height {
                 NumberAnimation{
-                    duration: 150
+                    duration: 167
+                    easing.type: Easing.BezierSpline
+                    easing.bezierCurve: [ 0, 0, 0, 1 ]
                 }
             }
             clip: true
@@ -219,8 +330,7 @@ Item {
                 }
                 return 38
             }
-            width: nav_list.width
-
+            width: layout_list.width
             Rectangle{
                 radius: 4
                 anchors{
@@ -238,33 +348,55 @@ Item {
                     hoverEnabled: true
                     anchors.fill: parent
                     onClicked: {
-                        if(type===0){
+                        if(type === 0){
                             if(model.tapFunc){
                                 model.tapFunc()
-                                return
-                            }
-                            if(nav_list.currentIndex !== position){
-                                nav_list.currentIndex = position
-                                model.tap()
+                            }else{
+                                nav_list.currentIndex = idx
+                                layout_footer.currentIndex = -1
+                                if(d.isMinimal || d.isCompact){
+                                    d.enableNavigationPanel = false
+                                }
                             }
                         }else{
-                            model.tap()
+                            if(model.tapFunc){
+                                model.tapFunc()
+                            }else{
+                                model.tap()
+                                d.stackItems.push(model)
+                                nav_list.currentIndex = nav_list.count-layout_footer.count+idx
+                                layout_footer.currentIndex = idx
+                                if(d.isMinimal || d.isCompact){
+                                    d.enableNavigationPanel = false
+                                }
+                            }
                         }
-                        displaMinimalMenu = false
                     }
                 }
                 color: {
                     if(FluTheme.dark){
-                        if((nav_list.currentIndex === position)&&type===0){
-                            return Qt.rgba(1,1,1,0.06)
+                        if(type===0){
+                            if(nav_list.currentIndex === idx){
+                                return Qt.rgba(1,1,1,0.06)
+                            }
+                        }else{
+                            if(nav_list.currentIndex === (nav_list.count-layout_footer.count+idx)){
+                                return Qt.rgba(1,1,1,0.06)
+                            }
                         }
                         if(item_mouse.containsMouse){
                             return Qt.rgba(1,1,1,0.03)
                         }
                         return Qt.rgba(0,0,0,0)
                     }else{
-                        if(nav_list.currentIndex === position&&type===0){
-                            return Qt.rgba(0,0,0,0.06)
+                        if(type===0){
+                            if(nav_list.currentIndex === idx){
+                                return Qt.rgba(0,0,0,0.06)
+                            }
+                        }else{
+                            if(nav_list.currentIndex === (nav_list.count-layout_footer.count+idx)){
+                                return Qt.rgba(0,0,0,0.06)
+                            }
                         }
                         if(item_mouse.containsMouse){
                             return Qt.rgba(0,0,0,0.03)
@@ -272,28 +404,54 @@ Item {
                         return Qt.rgba(0,0,0,0)
                     }
                 }
-
-                FluIcon{
-                    id:item_icon
-                    iconSource: {
-                        if(model.icon){
-                            return model.icon
+                Component{
+                    id:com_icon
+                    FluIcon{
+                        iconSource: {
+                            if(model.icon){
+                                return model.icon
+                            }
+                            return 0
                         }
-                        return 0
+                        iconSize: 15
                     }
+                }
+
+                Item{
+                    id:item_icon
                     width: 30
                     height: 30
-                    iconSize: 15
                     anchors{
                         verticalCenter: parent.verticalCenter
                         left:parent.left
                         leftMargin: 3
                     }
+                    Loader{
+                        anchors.centerIn: parent
+                        sourceComponent: {
+                            if(model.cusIcon){
+                                return model.cusIcon
+                            }
+                            return com_icon
+                        }
+                    }
                 }
 
                 FluText{
                     id:item_title
                     text:model.title
+                    opacity: {
+                        if(d.isCompactAndNotPanel){
+                            return false
+                        }
+                        return true
+                    }
+                    visible:opacity
+                    Behavior on opacity {
+                        NumberAnimation{
+                            duration: 83
+                        }
+                    }
                     color:{
                         if(item_mouse.pressed){
                             return FluTheme.dark ? FluColors.Grey80 : FluColors.Grey120
@@ -309,6 +467,7 @@ Item {
         }
     }
 
+
     Item {
         id:nav_app_bar
         width: parent.width
@@ -327,30 +486,42 @@ Item {
                 iconSize: 13
                 onClicked: {
                     nav_swipe.pop()
-                    nav_list.stackIndex.pop()
-                    var index = nav_list.stackIndex[nav_list.stackIndex.length-1]
-                    nav_list.enableStack = false
-                    nav_list.currentIndex = index
-                    nav_list.enableStack = true
+                    d.stackItems.pop()
+                    var item = d.stackItems[d.stackItems.length-1]
+                    d.enableStack = false
+                    if(item.idx<(nav_list.count - layout_footer.count)){
+                        layout_footer.currentIndex = -1
+                    }else{
+                        console.debug(item.idx-(nav_list.count-layout_footer.count))
+                        layout_footer.currentIndex = item.idx-(nav_list.count-layout_footer.count)
+                    }
+                    nav_list.currentIndex = item.idx
+                    d.enableStack = true
                 }
             }
             FluIconButton{
                 id:btn_nav
                 iconSource: FluentIcons.GlobalNavButton
                 iconSize: 15
-                Layout.preferredWidth: 40
+                Layout.preferredWidth: d.isMinimal ? 40 : 0
                 Layout.preferredHeight: 40
-                visible: displayMode === FluNavigationView.Minimal
                 Layout.alignment: Qt.AlignVCenter
                 onClicked: {
-                    displaMinimalMenu = !displaMinimalMenu
+                    d.enableNavigationPanel = !d.enableNavigationPanel
+                }
+                Behavior on Layout.preferredWidth{
+                    NumberAnimation{
+                        duration: 167
+                        easing.type: Easing.BezierSpline
+                        easing.bezierCurve: [ 0, 0, 0, 1 ]
+                    }
                 }
             }
-
             Image{
                 id:image_logo
                 Layout.preferredHeight: 20
                 Layout.preferredWidth: 20
+                source: control.logo
                 Layout.leftMargin: {
                     if(btn_nav.visible){
                         return 12
@@ -361,7 +532,7 @@ Item {
             }
             FluText{
                 Layout.alignment: Qt.AlignVCenter
-                text:root.title
+                text:control.title
                 Layout.leftMargin: 12
                 fontStyle: FluText.Body
             }
@@ -370,22 +541,36 @@ Item {
 
     Item{
         anchors{
-            left: displayMode === FluNavigationView.Minimal ? parent.left : layout_list.right
+            left: d.isMinimal || d.isCompactAndPanel  ? parent.left : layout_list.right
             top: nav_app_bar.bottom
             right: parent.right
             bottom: parent.bottom
+            leftMargin: d.isCompactAndPanel ? 50 : 0
         }
-
         StackView{
             id:nav_swipe
             anchors.fill: parent
             clip: true
             popEnter : Transition{}
             popExit : Transition {
-                NumberAnimation { properties: "y"; from: 0; to: nav_swipe.height; duration: 200 }
+                NumberAnimation {
+                    properties: "y"
+                    from: 0
+                    to: nav_swipe.height
+                    duration: 167
+                    easing.type: Easing.BezierSpline
+                    easing.bezierCurve: [ 1, 0, 0, 0 ]
+                }
             }
             pushEnter: Transition {
-                NumberAnimation { properties: "y"; from: nav_swipe.height; to: 0; duration: 200 }
+                NumberAnimation {
+                    properties: "y";
+                    from: nav_swipe.height;
+                    to: 0
+                    duration: 167
+                    easing.type: Easing.BezierSpline
+                    easing.bezierCurve: [ 0, 0, 0, 1 ]
+                }
             }
             pushExit : Transition{}
             replaceEnter : Transition{}
@@ -395,19 +580,43 @@ Item {
 
     MouseArea{
         anchors.fill: parent
-        enabled: (displayMode === FluNavigationView.Minimal && displaMinimalMenu)
+        enabled: d.isMinimalAndPanel||d.isCompactAndPanel
         onClicked: {
-            displaMinimalMenu = false
+            d.enableNavigationPanel = false
         }
     }
 
     Rectangle{
         id:layout_list
-        width: 300
+        width: {
+            if(d.isCompactAndNotPanel){
+                return 50
+            }
+            return 300
+        }
+        Behavior on width{
+            NumberAnimation{
+                duration: 167
+                easing.type: Easing.BezierSpline
+                easing.bezierCurve: [ 0, 0, 0, 1 ]
+            }
+        }
+        Behavior on x{
+            id:anim_layout_list_x
+            NumberAnimation{
+                duration: 167
+                easing.type: Easing.BezierSpline
+                easing.bezierCurve: [ 0, 0, 0, 1 ]
+            }
+        }
+        anchors{
+            top: parent.top
+            bottom: parent.bottom
+        }
         border.color: FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,230/255,234/255,1)
-        border.width:  displayMode === FluNavigationView.Minimal ? 1 : 0
+        border.width:  d.isMinimal || d.isCompactAndPanel ? 1 : 0
         color: {
-            if(displayMode === FluNavigationView.Minimal){
+            if(d.isMinimal || d.isCompactAndPanel){
                 return FluTheme.dark ? Qt.rgba(61/255,61/255,61/255,1) : Qt.rgba(243/255,243/255,243/255,1)
             }
             if(window && window.active){
@@ -415,64 +624,74 @@ Item {
             }
             return FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
         }
-        anchors{
-            top: parent.top
-            bottom: parent.bottom
-        }
-        x: {
-            if(displayMode !== FluNavigationView.Minimal)
-                return 0
-            return (displayMode === FluNavigationView.Minimal && displaMinimalMenu)  ? 0 : -width
-        }
-        Behavior on x{
-            id:anim_navi
-            NumberAnimation{
-                duration: 150
-            }
-        }
-
         Behavior on color{
             ColorAnimation {
                 duration: 300
             }
         }
-
+        x: {
+            if(d.displayMode !== FluNavigationView.Minimal)
+                return 0
+            return d.isMinimalAndPanel  ? 0 : -width
+        }
         Item{
             id:layout_header
             width: layout_list.width
+            clip: true
             y:nav_app_bar.height
-            height: {
-                if(loader_auto_suggest_box.item){
-                    return loader_auto_suggest_box.item.height
-                }
-                return 0
-            }
+            height: 38
             Loader{
                 id:loader_auto_suggest_box
-                anchors.horizontalCenter: parent.horizontalCenter
+                anchors.centerIn: parent
                 sourceComponent: autoSuggestBox
+                opacity: {
+                    if(d.isCompactAndNotPanel){
+                        return false
+                    }
+                    return true
+                }
+                visible: opacity
+                Behavior on opacity{
+                    NumberAnimation{
+                        duration: 83
+                    }
+                }
+            }
+
+            FluIconButton{
+                visible:opacity
+                opacity:d.isCompactAndNotPanel
+                Behavior on opacity{
+                    NumberAnimation{
+                        duration: 83
+                    }
+                }
+                hoverColor: FluTheme.dark ? Qt.rgba(1,1,1,0.03) : Qt.rgba(0,0,0,0.03)
+                pressedColor: FluTheme.dark ? Qt.rgba(1,1,1,0.03) : Qt.rgba(0,0,0,0.03)
+                normalColor: FluTheme.dark ? Qt.rgba(0,0,0,0) : Qt.rgba(0,0,0,0)
+                width:38
+                height:34
+                x:6
+                y:2
+                iconSize: 15
+                iconSource: {
+                    if(loader_auto_suggest_box.item){
+                        return loader_auto_suggest_box.item.autoSuggestBoxReplacement
+                    }
+                    return 0
+                }
+                onClicked: {
+                    d.enableNavigationPanel = !d.enableNavigationPanel
+                }
             }
         }
 
         ListView{
             id:nav_list
-            property bool enableStack: true
-            property var stackIndex: []
             clip: true
-            anchors{
-                top: layout_header.bottom
-                topMargin: 6
-                left: parent.left
-                right: parent.right
-                bottom: layout_footer.top
-            }
+            ScrollBar.vertical: FluScrollBar {}
+            model:d.handleItems()
             highlightMoveDuration: 150
-            currentIndex: -1
-            onCurrentIndexChanged: {
-                if(enableStack){
-                    stackIndex.push(currentIndex)
-                }
-            }
             highlight: Item{
                 clip: true
                 Rectangle{
@@ -487,11 +706,26 @@ Item {
                     }
                 }
             }
-            ScrollBar.vertical: FluScrollBar {}
-            model:handleItems()
+            onCurrentIndexChanged: {
+                if(d.enableStack){
+                    var item = model[currentIndex]
+                    if(item instanceof FluPaneItem){
+                        item.tap()
+                        d.stackItems.push(item)
+                    }
+                }
+            }
+            currentIndex: -1
+            anchors{
+                top: layout_header.bottom
+                topMargin: 6
+                left: parent.left
+                right: parent.right
+                bottom: layout_footer.top
+            }
             delegate: Loader{
                 property var model: modelData
-                property var position: index
+                property var idx: index
                 property int type: 0
                 sourceComponent: {
                     if(modelData instanceof FluPaneItem){
@@ -506,24 +740,43 @@ Item {
                     if(modelData instanceof FluPaneItemExpander){
                         return com_panel_item_expander
                     }
+                    if(modelData instanceof FluPaneItemEmpty){
+                        return com_panel_item_empty
+                    }
                 }
             }
         }
-
         ListView{
             id:layout_footer
+            clip: true
             width: layout_list.width
             height: childrenRect.height
             anchors.bottom: parent.bottom
+            interactive: false
+            currentIndex: -1
             model: {
                 if(footerItems){
                     return footerItems.children
                 }
             }
-            currentIndex: -1
+            highlightMoveDuration: 150
+            highlight: Item{
+                clip: true
+                Rectangle{
+                    height: 18
+                    radius: 1.5
+                    color: FluTheme.primaryColor.dark
+                    width: 3
+                    anchors{
+                        verticalCenter: parent.verticalCenter
+                        left: parent.left
+                        leftMargin: 6
+                    }
+                }
+            }
             delegate: Loader{
                 property var model: modelData
-                property var position: index
+                property var idx: index
                 property int type: 1
                 sourceComponent: {
                     if(modelData instanceof FluPaneItem){
@@ -540,27 +793,92 @@ Item {
         }
     }
 
-    function handleItems(){
-        var idx = 0
-        var data = []
-        if(items){
-            for(var i=0;i<items.children.length;i++){
-                var item = items.children[i]
-                item.idx = idx
-                data.push(item)
-                idx++
-                if(item instanceof FluPaneItemExpander){
-                    for(var j=0;j<item.children.length;j++){
-                        var itemChild = item.children[j]
-                        itemChild.parent = item
-                        itemChild.idx = idx
-                        data.push(itemChild)
-                        idx++
+    Popup{
+        property var childModel
+        id:control_popup
+        enter: Transition {
+            NumberAnimation {
+                property: "opacity"
+                from:0
+                to:1
+                duration: 83
+            }
+        }
+        background: Rectangle{
+            width: 160
+            radius: 4
+            FluShadow{
+                radius: 4
+            }
+            color: FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(248/255,250/255,253/255,1)
+            height: 38*Math.min(Math.max(list_view.count,1),8)
+            ListView{
+                id:list_view
+                anchors.fill: parent
+                clip: true
+                currentIndex: -1
+                model: control_popup.childModel
+                ScrollBar.vertical: FluScrollBar {}
+                delegate:Button{
+                    width: 160
+                    padding:10
+                    background: Rectangle{
+                        color:  {
+                            if(hovered){
+                                return FluTheme.dark ? Qt.rgba(63/255,60/255,61/255,1) : Qt.rgba(237/255,237/255,242/255,1)
+                            }
+                            return FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(0,0,0,0)
+                        }
+                    }
+                    contentItem: FluText{
+                        text:modelData.title
+                        anchors{
+                            verticalCenter: parent.verticalCenter
+                        }
+                    }
+                    onClicked: {
+                        if(modelData.tapFunc){
+                            modelData.tapFunc()
+                        }else{
+                            nav_list.currentIndex = idx
+                            layout_footer.currentIndex = -1
+                            if(d.isMinimal || d.isCompact){
+                                d.enableNavigationPanel = false
+                            }
+                        }
+                        control_popup.close()
                     }
                 }
             }
         }
-        return data
+        function showPopup(pos,model){
+            control_popup.x = pos.x
+            control_popup.y = pos.y
+            control_popup.childModel = model
+            control_popup.open()
+        }
+    }
+
+    Timer{
+        id:timer_anim_x_enable
+        interval: 150
+        onTriggered: {
+            anim_layout_list_x.enabled = true
+        }
+    }
+
+    function collapseAll(){
+        for(var i=0;i<nav_list.model.length;i++){
+            var item = nav_list.model[i]
+            if(item instanceof FluPaneItemExpander){
+                item.isExpand = false
+            }
+        }
+    }
+
+    function setCurrentIndex(index){
+        nav_list.currentIndex = index
+
     }
 
     function getItems(){
@@ -571,12 +889,25 @@ Item {
         nav_swipe.push(url)
     }
 
-    function setCurrentIndex(index){
-        nav_list.currentIndex = index
-    }
-
     function getCurrentIndex(){
         return nav_list.currentIndex
     }
 
+    function startPageByItem(data){
+        var items = getItems();
+        for(var i=0;i<items.length;i++){
+            var item =  items[i]
+            if(item.key === data.key){
+                if(getCurrentIndex() === i){
+                    return
+                }
+                setCurrentIndex(i)
+                if(item.parent && !d.isCompactAndNotPanel){
+                    item.parent.isExpand = true
+                }
+                return
+            }
+        }
+    }
+
 }

src/controls/FluPagination.qml

@@ -1,12 +1,10 @@
 import QtQuick
 import QtQuick.Controls
-import FluentUI
 import QtQuick.Layouts
+import FluentUI
 
 Item {
     id: control
-
-
     signal requestPage(int page,int count)
     property string previousText: "<上一页"
     property string nextText: "下一页>"

src/controls/FluPaneItem.qml

@@ -7,6 +7,7 @@ QtObject {
     property string title
     property int order : 0
     property int icon
+    property Component cusIcon
     property bool recentlyAdded: false
     property bool recentlyUpdated: false
     property string desc

src/controls/FluPaneItemEmpty.qml

@@ -0,0 +1,7 @@
+import QtQuick
+
+QtObject {
+    readonly property string key : FluApp.uuid()
+    property var parent
+    property int idx
+}

src/controls/FluPaneItemExpander.qml

@@ -2,12 +2,11 @@
 import FluentUI
 
 FluObject {
-    readonly property int flag : 3
     readonly property string key : FluApp.uuid()
     property string title
-    property int icon
+    property var icon
+    property Component cusIcon
     property bool isExpand: false
     property var parent
     property int idx
-    signal tap
 }

src/controls/FluPaneItemHeader.qml

@@ -1,7 +1,6 @@
 import QtQuick
 
 QtObject {
-    readonly property int flag : 1
     readonly property string key : FluApp.uuid()
     property string title
     property var parent

src/controls/FluPaneItemSeparator.qml

@@ -1,7 +1,6 @@
 import QtQuick
 
 QtObject {
-    readonly property int flag : 2
     readonly property string key : FluApp.uuid()
     property var parent
     property int idx