update

Add automatic dark color mode switching function.

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,14 +2,10 @@
 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)
         FluTheme.frameless = ("windows" === Qt.platform.os)
@@ -20,9 +16,11 @@ Window {
             "/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

@@ -1,7 +1,25 @@
 #include "AppInfo.h"
+#include "lang/En.h"
+#include "lang/Zh.h"
+
 
 AppInfo::AppInfo(QObject *parent)
     : QObject{parent}
 {
-    version("1.2.4");
+    version("1.2.5");
+    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

@@ -2,14 +2,17 @@
 #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_MultiWindow.qml

@@ -24,6 +24,86 @@ 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
+        code:'FluWindow{
+  //launchMode: FluWindow.Standard
+  //launchMode: FluWindow.SingleTask
+     launchMode: FluWindow.SingleInstance
+}
+'
+    }
+
+
     FluArea{
         Layout.fillWidth: true
         height: 100

example/T_Pivot.qml

@@ -21,6 +21,7 @@ FluScrollablePage{
 
         FluPivot{
             anchors.fill: parent
+            currentIndex: 2
             FluPivotItem{
                 title:"All"
                 contentItem:FluText{

example/T_RatingControl.qml

@@ -0,0 +1,43 @@
+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
+        code:'FluRatingControl{
+
+}'
+    }
+
+
+}

example/T_Settings.qml

@@ -23,12 +23,12 @@ FluScrollablePage{
         ColumnLayout{
             spacing: 10
             anchors{
-                verticalCenter: parent.verticalCenter
+                top: parent.top
                 left: parent.left
             }
 
             FluText{
-                text:"NavigationView Display Mode"
+                text:lang.navigation_view_display_mode
                 fontStyle: FluText.BodyStrong
                 Layout.bottomMargin: 4
             }
@@ -40,11 +40,49 @@ FluScrollablePage{
                     selected : MainEvent.displayMode===modelData.mode
                     text:modelData.title
                     onClicked:{
-                       MainEvent.displayMode = modelData.mode
+                        MainEvent.displayMode = 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.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/component/CodeExpander.qml

@@ -118,7 +118,8 @@ FluExpander{
           "FluTableView",
           "FluColors",
           "FluTheme",
-          "FluStatusView"
+          "FluStatusView",
+          "FluRatingControl"
       ];
       code = code.replace(/\n/g, "<br>");
       code = code.replace(/ /g, "&nbsp;");

example/example.pro

@@ -3,12 +3,19 @@ CONFIG += c++17
 DEFINES += QT_DEPRECATED_WARNINGS QT_NO_WARNING_OUTPUT
 
 HEADERS += \
+    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

@@ -10,14 +10,14 @@ FluObject{
 
     FluPaneItemSeparator{}
     FluPaneItem{
-        title:"About"
+        title:lang.about
         icon:FluentIcons.Contact
         tapFunc:function(){
             FluApp.navigate("/about")
         }
     }
     FluPaneItem{
-        title:"Settings"
+        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"

example/lang/En.cpp

@@ -0,0 +1,21 @@
+#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");
+    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,29 @@
+#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,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,21 @@
+#include "Zh.h"
+
+Zh::Zh(QObject *parent)
+    : Lang{parent}
+{
+    setObjectName("Zh");
+    home("首页");
+    basic_input("基本输入");
+    form("表单");
+    surface("表面");
+    popus("弹窗");
+    navigation("导航");
+    theming("主题");
+    media("媒体");
+    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

@@ -5,6 +5,7 @@
 #include <QQuickWindow>
 #include <QQuickStyle>
 #include <QProcess>
+#include "lang/Lang.h"
 #include "AppInfo.h"
 #include "ChatController.h"
 
@@ -15,9 +16,17 @@ int main(int argc, char *argv[])
     QCoreApplication::setApplicationName("FluentUI");
     QQuickStyle::setStyle("Basic");
     QGuiApplication app(argc, argv);
+    app.setQuitOnLastWindowClosed(false);
     QQmlApplicationEngine engine;
     qmlRegisterType<ChatController>("Controller",1,0,"ChatController");
-    engine.rootContext()->setContextProperty("appInfo",new AppInfo());
+    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

@@ -7,12 +7,13 @@ FluWindow {
 
     id:window
 
-    width: 500
+    width: 600
     height: 600
-    minimumWidth: 500
+    minimumWidth: 600
     minimumHeight: 600
-    maximumWidth: 500
+    maximumWidth: 600
     maximumHeight: 600
+    launchMode: FluWindow.SingleTask
 
     title:"关于"
 
@@ -59,7 +60,6 @@ FluWindow {
 
         RowLayout{
             spacing: 14
-            Layout.topMargin: 20
             Layout.leftMargin: 15
             FluText{
                 text:"GitHub："
@@ -73,13 +73,28 @@ FluWindow {
                 }
             }
         }
+
+        RowLayout{
+            spacing: 14
+            Layout.leftMargin: 15
+            FluText{
+                text:"B站："
+            }
+            FluTextButton{
+                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
@@ -93,5 +108,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/MainPage.qml

@@ -2,14 +2,16 @@
 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
 
@@ -18,9 +20,33 @@ FluWindow {
         z:9
         showDark: true
         width:parent.width
-        darkText: "Dark Mode"
+        darkText: lang.dark_mode
     }
 
+    SystemTrayIcon {
+        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()
+                }
+            }
+    }
+
+
     FluNavigationView{
         id:nav_view
         anchors.fill: parent
@@ -35,7 +61,7 @@ FluWindow {
             anchors.centerIn: parent
             iconSource: FluentIcons.Search
             items: ItemsOriginal.getSearchData()
-            placeholderText: "Search"
+            placeholderText: lang.search
             onItemClicked:
                 (data)=>{
                     ItemsOriginal.startPageByItem(data)

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

@@ -160,5 +160,13 @@
         <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/FluApp.cpp

@@ -44,8 +44,8 @@ void FluApp::init(QQuickWindow *window){
 void FluApp::run(){
 #ifdef Q_OS_WIN
     if(!isCompositionEnabled()){
-            FluTheme::getInstance()->frameless(false);
-        }
+        FluTheme::getInstance()->frameless(false);
+    }
 #endif
     navigate(initialRoute());
 }
@@ -58,19 +58,41 @@ void FluApp::navigate(const QString& route,const QJsonObject& argument,FluRegist
     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->setColor(QColor(Qt::transparent));
-    if(view->maximumWidth()==view->minimumWidth()&&view->maximumHeight()==view->minimumHeight()){
-        view->resize(view->minimumSize());
-    }
     view->show();
 }
 
@@ -105,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

@@ -34,6 +34,8 @@ public:
 
     Q_INVOKABLE QString uuid();
 
+    Q_INVOKABLE void closeApp();
+
 public:
     QMap<quint64, QQuickWindow*> wnds;
 private:

src/FluTheme.cpp

@@ -1,6 +1,8 @@
 #include "FluTheme.h"
 
 #include "FluColors.h"
+#include <QPalette>
+#include <QGuiApplication>
 
 FluTheme* FluTheme::m_instance = nullptr;
 
@@ -19,5 +21,13 @@ FluTheme::FluTheme(QObject *parent)
     textSize(13);
     nativeText(true);
     frameless(true);
-    dark(false);
+    std::function<bool()> isDark = [](){
+        QPalette palette = (qobject_cast<QGuiApplication *>(QCoreApplication::instance()))->palette();
+        QColor color = palette.color(QPalette::Window).rgb();
+        return !(color.red() * 0.2126 + color.green() * 0.7152 + color.blue() * 0.0722 > 255 / 2);
+    };
+    dark(isDark());
+    connect(qobject_cast<QGuiApplication *>(QCoreApplication::instance()), &QGuiApplication::paletteChanged, this, [=] (const QPalette &) {
+        dark(isDark());
+    });
 }

src/Fluent.cpp

@@ -34,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");

src/NativeEventFilter.cpp

@@ -10,72 +10,67 @@ bool NativeEventFilter::nativeEventFilter(const QByteArray &eventType, void *mes
 {
 #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_COMMAND: {
-              SendMessage(msg->hwnd, WM_SYSCOMMAND, msg->wParam, msg->lParam);
-              *result = DefWindowProc(msg->hwnd, msg->message, msg->wParam, msg->lParam);
-              return true;
-            }
-            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;
+        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;
             }
-            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 &&
+            if (x < winrect.right && x >= winrect.right - 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;
+                *result = HTBOTTOMRIGHT;
+                return true;
             }
-            default:
-                break;
+            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/WindowHelper.cpp

@@ -23,21 +23,29 @@ WindowHelper::WindowHelper(QObject *parent)
 
 void WindowHelper::initWindow(QQuickWindow* window){
     this->window = window;
-#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);
-    }
-#endif
 }
 
-QVariant WindowHelper::createRegister(const QString& path){
-    FluRegister *p = new FluRegister(this->window);
-    p->from(this->window);
+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(QQuickWindow* window,const QString& path){
+    FluRegister *p = new FluRegister(window);
+    p->from(window);
     p->path(path);
     return  QVariant::fromValue(p);
 }

src/WindowHelper.h

@@ -16,10 +16,13 @@ public:
 
     Q_INVOKABLE void initWindow(QQuickWindow* window);
     Q_INVOKABLE void destoryWindow();
-    Q_INVOKABLE QVariant createRegister(const QString& path);
+    Q_INVOKABLE QVariant createRegister(QQuickWindow* window,const QString& path);
+
+    Q_INVOKABLE void firstUpdate();
 
 private:
     QQuickWindow* window;
+    bool isFisrt=true;
 };
 
 #endif // WINDOWHELPER_H

src/controls/FluAppBar.qml

@@ -67,7 +67,6 @@ Rectangle{
         height: root.height
         spacing: 0
 
-
         RowLayout{
             Layout.alignment: Qt.AlignVCenter
             Layout.rightMargin: 5

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/FluColorPicker.qml

@@ -33,34 +33,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/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

@@ -76,12 +76,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

@@ -84,7 +84,9 @@ Item {
         height: expand ? contentHeight : 0
         Behavior on height {
             NumberAnimation{
-                duration: 150
+                duration: 167
+                easing.type: Easing.Bezier
+                easing.bezierCurve: expand ? [ 0, 0, 0, 1 ] : [ 1, 0, 0, 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/FluNavigationView.qml

@@ -120,7 +120,9 @@ Item {
             }
             Behavior on height {
                 NumberAnimation{
-                    duration: 150
+                    duration: 167
+                    easing.type: Easing.Bezier
+                    easing.bezierCurve: [ 0, 0, 0, 1 ]
                 }
             }
         }
@@ -137,7 +139,9 @@ Item {
             }
             Behavior on height {
                 NumberAnimation{
-                    duration: 150
+                    duration: 167
+                    easing.type: Easing.Bezier
+                    easing.bezierCurve: [ 0, 0, 0, 1 ]
                 }
             }
             width: layout_list.width
@@ -206,12 +210,12 @@ Item {
                     visible:opacity
                     Behavior on opacity {
                         NumberAnimation{
-                            duration: 220
+                            duration: 83
                         }
                     }
                     Behavior on rotation {
                         NumberAnimation{
-                            duration: 150
+                            duration: 83
                         }
                     }
                 }
@@ -246,22 +250,37 @@ 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
@@ -275,7 +294,7 @@ Item {
                     visible:opacity
                     Behavior on opacity {
                         NumberAnimation{
-                            duration: 220
+                            duration: 83
                         }
                     }
                     anchors{
@@ -298,7 +317,9 @@ Item {
         Item{
             Behavior on height {
                 NumberAnimation{
-                    duration: 150
+                    duration: 167
+                    easing.type: Easing.Bezier
+                    easing.bezierCurve: [ 0, 0, 0, 1 ]
                 }
             }
             clip: true
@@ -382,23 +403,39 @@ 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
@@ -411,7 +448,7 @@ Item {
                     visible:opacity
                     Behavior on opacity {
                         NumberAnimation{
-                            duration: 220
+                            duration: 83
                         }
                     }
                     color:{
@@ -473,7 +510,9 @@ Item {
                 }
                 Behavior on Layout.preferredWidth{
                     NumberAnimation{
-                        duration: 220
+                        duration: 167
+                        easing.type: Easing.Bezier
+                        easing.bezierCurve: [ 0, 0, 0, 1 ]
                     }
                 }
             }
@@ -513,10 +552,24 @@ Item {
             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.Bezier
+                    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.Bezier
+                    easing.bezierCurve: [ 0, 0, 0, 1 ]
+                }
             }
             pushExit : Transition{}
             replaceEnter : Transition{}
@@ -542,13 +595,17 @@ Item {
         }
         Behavior on width{
             NumberAnimation{
-                duration: 150
+                duration: 167
+                easing.type: Easing.Bezier
+                easing.bezierCurve: [ 0, 0, 0, 1 ]
             }
         }
         Behavior on x{
             id:anim_layout_list_x
             NumberAnimation{
-                duration: 150
+                duration: 167
+                easing.type: Easing.Bezier
+                easing.bezierCurve: [ 0, 0, 0, 1 ]
             }
         }
         anchors{
@@ -595,7 +652,7 @@ Item {
                 visible: opacity
                 Behavior on opacity{
                     NumberAnimation{
-                        duration: 100
+                        duration: 83
                     }
                 }
             }
@@ -605,7 +662,7 @@ Item {
                 opacity:d.isCompactAndNotPanel
                 Behavior on opacity{
                     NumberAnimation{
-                        duration: 220
+                        duration: 83
                     }
                 }
                 hoverColor: FluTheme.dark ? Qt.rgba(1,1,1,0.03) : Qt.rgba(0,0,0,0.03)
@@ -743,7 +800,7 @@ Item {
                 property: "opacity"
                 from:0
                 to:1
-                duration: 150
+                duration: 83
             }
         }
         background: Rectangle{

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/FluPaneItemExpander.qml

@@ -4,7 +4,8 @@ import FluentUI
 FluObject {
     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

src/controls/FluPivot.qml

@@ -7,6 +7,7 @@ Item {
 
     id:control
     default property alias content: d.children
+    property alias currentIndex: nav_list.currentIndex
     property color normalColor: FluTheme.dark ? FluColors.Grey120 : FluColors.Grey120
     property color hoverColor: FluTheme.dark ? FluColors.Grey10 : FluColors.Black
 

src/controls/FluRatingControl.qml

@@ -0,0 +1,60 @@
+import QtQuick
+import QtQuick.Controls
+import FluentUI
+
+Item {
+
+    property int number: 5
+    property int spacing: 4
+    property int size: 18
+    property int value:0
+
+    id:control
+    implicitWidth: container.width
+    implicitHeight: container.height
+
+    QtObject{
+        id:d
+        property int mouseValue: 0
+        property int itemSize: control.size+spacing*2
+    }
+
+    Row{
+        id:container
+        spacing: 0
+        Repeater{
+            model:control.number
+            Item{
+                width: d.itemSize
+                height: d.itemSize
+                FluIcon{
+                    property bool isSelected : {
+                        if(d.mouseValue!==0){
+                            return index<d.mouseValue
+                        }
+                        return index<control.value
+                    }
+                    iconSize: control.size
+                    iconSource: isSelected ? FluentIcons.FavoriteStarFill : FluentIcons.FavoriteStar
+                    iconColor: isSelected ? FluTheme.primaryColor.dark : (FluTheme.dark ? "#FFFFFF" : "#000000")
+                    anchors.centerIn: parent
+                }
+            }
+        }
+    }
+
+    MouseArea{
+        anchors.fill: container
+        hoverEnabled: true
+        onPositionChanged: (mouse)=>{
+            d.mouseValue = Number(mouse.x / d.itemSize)+1
+        }
+        onExited: {
+            d.mouseValue = 0
+        }
+        onClicked: (mouse)=>{
+            control.value = Number(mouse.x / d.itemSize)+1
+        }
+    }
+
+}

src/controls/FluTextArea.qml

@@ -1,4 +1,5 @@
 import QtQuick
+import QtQuick.Controls
 import QtQuick.Controls.impl
 import QtQuick.Templates as T
 

src/controls/FluTextFiled.qml

@@ -1,4 +1,5 @@
 import QtQuick
+import QtQuick.Controls
 import QtQuick.Controls.impl
 import QtQuick.Templates as T
 
@@ -26,7 +27,6 @@ T.TextField {
         y: control.topPadding
         width: control.width - (control.leftPadding + control.rightPadding)
         height: control.height - (control.topPadding + control.bottomPadding)
-
         text: control.placeholderText
         font: control.font
         color: control.placeholderTextColor

src/controls/FluTimePicker.qml

@@ -99,243 +99,249 @@ Rectangle {
         text:"AM/PM"
     }
 
-    Popup{
+    Menu{
         id:popup
-        width: 300
-        height: 340
+        width: container.width
+        height: container.height
         modal: true
         dim:false
         enter: Transition {
+            reversible: true
             NumberAnimation {
                 property: "opacity"
                 from:0
                 to:1
-                duration: 150
-            }
-            NumberAnimation {
-                property: "y"
-                from:0
-                to:popup.y
-                duration: 150
+                duration: 83
             }
         }
-        background:Item{}
-        contentItem: Rectangle{
-            id:container
-            anchors.fill: parent
-            radius: 4
-            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
+                height: 340
+                width: 300
+                radius: 4
+                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
+                }
+                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_hour.text = model
-                                    }
-                                    if(type === 1){
-                                        text_minute.text = model
-                                    }
-                                    if(type === 2){
-                                        text_ampm.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_hour.text = model
+                                        }
+                                        if(type === 1){
+                                            text_minute.text = model
+                                        }
+                                        if(type === 2){
+                                            text_ampm.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: isH ? 100 : 150
+                        height: parent.height
+                        boundsBehavior:Flickable.StopAtBounds
+                        ScrollBar.vertical: FluScrollBar {}
+                        preferredHighlightBegin: 0
+                        preferredHighlightEnd: 0
+                        highlightMoveDuration: 0
+                        model: isH ? generateArray(1,12) : generateArray(0,23)
+                        clip: true
+                        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:  isH ? 100 : 150
+                        height: parent.height
+                        model: generateArray(0,59)
+                        clip: true
+                        preferredHighlightBegin: 0
+                        preferredHighlightEnd: 0
+                        highlightMoveDuration: 0
+                        ScrollBar.vertical: FluScrollBar {}
+                        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
+                        visible: isH
+                    }
+                    ListView{
+                        id:list_view_3
+                        width: 100
+                        height: 76
+                        model: ["上午","下午"]
+                        clip: true
+                        visible: isH
+                        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: isH ? 100 : 150
-                    height: parent.height
-                    boundsBehavior:Flickable.StopAtBounds
-                    ScrollBar.vertical: FluScrollBar {}
-                    preferredHighlightBegin: 0
-                    preferredHighlightEnd: 0
-                    highlightMoveDuration: 0
-                    model: isH ? generateArray(1,12) : generateArray(0,23)
-                    clip: true
-                    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:  isH ? 100 : 150
-                    height: parent.height
-                    model: generateArray(0,59)
-                    clip: true
-                    preferredHighlightBegin: 0
-                    preferredHighlightEnd: 0
-                    highlightMoveDuration: 0
-                    ScrollBar.vertical: FluScrollBar {}
-                    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
-                    visible: isH
-                }
-                ListView{
-                    id:list_view_3
-                    width: 100
-                    height: 76
-                    model: ["上午","下午"]
-                    clip: true
-                    visible: isH
-                    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()
+                        }
                     }
                 }
-
             }
-
         }
         y:35
         function showPopup() {
@@ -373,12 +379,12 @@ Rectangle {
             }
 
             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/FluToggleSwitch.qml

@@ -72,16 +72,32 @@ FluControl {
                 anchors.verticalCenter: parent.verticalCenter
                 color: selected ? "#FFFFFF" : "#666666"
                 Behavior on anchors.leftMargin  {
-                    NumberAnimation { duration: 150 }
+                    NumberAnimation {
+                        duration: 167
+                        easing.type: Easing.Bezier
+                        easing.bezierCurve: [ 1, 0, 0, 0 ]
+                    }
                 }
                 Behavior on anchors.rightMargin  {
-                    NumberAnimation { duration: 150 }
+                    NumberAnimation {
+                        duration: 167
+                        easing.type: Easing.Bezier
+                        easing.bezierCurve: [ 1, 0, 0, 0 ]
+                    }
                 }
                 Behavior on width {
-                    NumberAnimation { duration: 150 }
+                    NumberAnimation {
+                        duration: 167
+                        easing.type: Easing.Bezier
+                        easing.bezierCurve: [ 1, 0, 0, 0 ]
+                    }
                 }
                 Behavior on scale {
-                    NumberAnimation { duration: 150 }
+                    NumberAnimation {
+                        duration: 167
+                        easing.type: Easing.Bezier
+                        easing.bezierCurve: [ 1, 0, 0, 0 ]
+                    }
                 }
             }
         }

src/controls/FluWindow.qml

@@ -6,11 +6,21 @@ import FluentUI
 
 ApplicationWindow {
 
-    id:window
+    enum LaunchMode {
+        Standard,
+        SingleTask,
+        SingleInstance
+    }
+
     default property alias content: container.data
+    property bool closeDestory: true
+    property int launchMode: FluWindow.Standard
+    property string route
     property var argument:({})
     property var pageRegister
     signal initArgument(var argument)
+
+    id:window
     background: Rectangle{
         color: {
             if(active){
@@ -32,10 +42,20 @@ ApplicationWindow {
         clip: true
     }
 
+    onActiveChanged: {
+        if(active){
+            helper.firstUpdate()
+        }
+    }
+
     onClosing:
         (event)=>{
-            //销毁窗口，释放资源
-            helper.destoryWindow()
+            if(closeDestory){
+                destoryWindow()
+            }else{
+                visible = false
+                event.accepted = false
+            }
         }
 
     FluInfoBar{
@@ -50,6 +70,8 @@ ApplicationWindow {
     Component.onCompleted: {
         helper.initWindow(window)
         initArgument(argument)
+        window.x = (Screen.width - window.width)/2
+        window.y = (Screen.desktopAvailableHeight - window.height)/2
     }
 
     function showSuccess(text,duration,moremsg){
@@ -69,7 +91,11 @@ ApplicationWindow {
     }
 
     function registerForPageResult(path){
-        return helper.createRegister(path)
+        return helper.createRegister(window,path)
+    }
+
+    function destoryWindow(){
+        helper.destoryWindow()
     }
 
     function onResult(data){

src/res.qrc

@@ -72,5 +72,6 @@
         <file>controls/FluToggleButton.qml</file>
         <file>controls/FluStatusView.qml</file>
         <file>controls/FluPaneItemEmpty.qml</file>
+        <file>controls/FluRatingControl.qml</file>
     </qresource>
 </RCC>