update

example/AboutPage.qml

@@ -34,7 +34,7 @@ FluWindow {
                 fontStyle: FluText.Title
             }
             FluText{
-                text:"v1.0.3"
+                text:"v1.0.4"
                 fontStyle: FluText.Body
                 Layout.alignment: Qt.AlignBottom
             }

example/MainPage.qml

@@ -8,8 +8,8 @@ import FluentUI 1.0
 
 FluWindow {
     id:rootwindow
-    width: 800
-    height: 600
+    width: 860
+    height: 680
     title: "FluentUI"
     minimumWidth: 500
     minimumHeight: 400
@@ -59,6 +59,13 @@ FluWindow {
             }
         }
 
+        FluPaneItem{
+            title:"TimePicker"
+            onTap:{
+                nav_view.push("qrc:/T_TimePicker.qml")
+            }
+        }
+
         FluPaneItemHeader{
             title:"Surface"
         }
@@ -116,7 +123,6 @@ FluWindow {
             title:"Theming"
         }
 
-
         FluPaneItem{
             title:"Theme"
             onTap:{

example/T_Awesome.qml

@@ -30,8 +30,8 @@ FluContentPage {
     }
     GridView{
         id:grid_view
-        cellWidth: 120
-        cellHeight: 60
+        cellWidth: 80
+        cellHeight: 80
         clip: true
         model:FluApp.awesomelist()
         ScrollBar.vertical: FluScrollBar {}
@@ -43,8 +43,8 @@ FluContentPage {
             bottom: parent.bottom
         }
         delegate: Item {
-            width: 120
-            height: 60
+            width: 68
+            height: 80
             FluIconButton{
                 id:item_icon
                 icon:modelData.icon
@@ -57,10 +57,14 @@ FluContentPage {
             }
             FluText {
                 id:item_name
-                font.pixelSize: 10;
+                font.pixelSize: 10
                 anchors.horizontalCenter: parent.horizontalCenter
                 anchors.top: item_icon.bottom
+                width:parent.width
+                wrapMode: Text.WrapAnywhere
                 text: modelData.name
+
+                horizontalAlignment: Text.AlignHCenter
             }
         }
     }

example/T_Buttons.qml

@@ -81,8 +81,9 @@ FluScrollablePage{
         paddings: 10
 
         FluIconButton{
-            icon:FluentIcons.FA_close
+            icon:FluentIcons.ChromeCloseContrast
             disabled:icon_button_switch.checked
+            iconSize: 15
             anchors{
                 verticalCenter: parent.verticalCenter
                 left: parent.left

example/T_Theme.qml

@@ -20,7 +20,7 @@ FluScrollablePage{
                 color: mouse_item.containsMouse ? Qt.lighter(modelData.normal,1.1) : modelData.normal
                 FluIcon {
                     anchors.centerIn: parent
-                    icon: FluentIcons.FA_check
+                    icon: FluentIcons.AcceptMedium
                     iconSize: 15
                     visible: modelData === FluTheme.primaryColor
                     color: FluTheme.isDark ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1)
@@ -38,7 +38,6 @@ FluScrollablePage{
     }
     FluText{
         text:"夜间模式"
-        fontStyle: FluText.Subtitle
         Layout.topMargin: 20
     }
     FluToggleSwitch{
@@ -49,7 +48,6 @@ FluScrollablePage{
     }
     FluText{
         text:"无边框"
-        fontStyle: FluText.Subtitle
         Layout.topMargin: 20
     }
     FluToggleSwitch{
@@ -58,4 +56,14 @@ FluScrollablePage{
             FluTheme.isFrameless = !FluTheme.isFrameless
         }
     }
+    FluText{
+        text:"native文本渲染"
+        Layout.topMargin: 20
+    }
+    FluToggleSwitch{
+        checked: FluTheme.isNativeText
+        onClickFunc:function(){
+            FluTheme.isNativeText = !FluTheme.isNativeText
+        }
+    }
 }

example/T_TimePicker.qml

@@ -0,0 +1,61 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
+import QtQuick.Window 2.15
+import FluentUI 1.0
+
+FluScrollablePage{
+
+    title:"TimePicker"
+
+
+    FluArea{
+        width: parent.width
+        Layout.topMargin: 20
+        height: 80
+        paddings: 10
+
+        ColumnLayout{
+
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+
+            FluText{
+                text:"hourFormat=FluTimePicker.H"
+            }
+
+            FluTimePicker{
+            }
+
+        }
+    }
+
+
+    FluArea{
+        width: parent.width
+        Layout.topMargin: 20
+        height: 80
+        paddings: 10
+
+        ColumnLayout{
+
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+
+            FluText{
+                text:"hourFormat=FluTimePicker.HH"
+            }
+
+            FluTimePicker{
+                hourFormat:FluTimePicker.HH
+            }
+
+        }
+    }
+
+
+}

example/qml.qrc

@@ -30,5 +30,6 @@
         <file>T_TreeView.qml</file>
         <file>T_Expander.qml</file>
         <file>MainPage.qml</file>
+        <file>T_TimePicker.qml</file>
     </qresource>
 </RCC>

src/FluApp.cpp

@@ -82,7 +82,7 @@ QJsonArray FluApp::awesomelist(const QString& keyword)
             obj.insert("icon",icon);
             arr.append(obj);
         }else{
-            if(name.mid(3).contains(keyword)){
+            if(name.contains(keyword)){
                 QJsonObject obj;
                 obj.insert("name",name);
                 obj.insert("icon",icon);

src/FluTheme.cpp

@@ -17,6 +17,7 @@ FluTheme::FluTheme(QObject *parent)
 {
     primaryColor(FluColors::getInstance()->Blue());
     textSize(13);
-    isFrameless(true);
+    isNativeText(false);
+    isFrameless(false);
     isDark(false);
 }

src/FluTheme.h

@@ -11,6 +11,7 @@ class FluTheme : public QObject
     Q_PROPERTY_AUTO(FluColorSet*,primaryColor)
     Q_PROPERTY_AUTO(bool,isFrameless);
     Q_PROPERTY_AUTO(bool,isDark);
+    Q_PROPERTY_AUTO(bool,isNativeText);
     Q_PROPERTY_AUTO(int,textSize);
 public:
     explicit FluTheme(QObject *parent = nullptr);

src/Fluent.cpp

@@ -42,6 +42,12 @@ void Fluent::registerTypes(const char *uri){
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluPaneItemSeparator.qml"),uri,major,minor,"FluPaneItemSeparator");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluNavigationView.qml"),uri,major,minor,"FluNavigationView");
 
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluCalendarDatePicker.qml"),uri,major,minor,"FluCalendarDatePicker");
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluCalenderView.qml"),uri,major,minor,"FluCalenderView");
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluDatePicker.qml"),uri,major,minor,"FluDatePicker");
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluTimePicker.qml"),uri,major,minor,"FluTimePicker");
+
+
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluAutoSuggestBox.qml"),uri,major,minor,"FluAutoSuggestBox");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluExpander.qml"),uri,major,minor,"FluExpander");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluTreeView.qml"),uri,major,minor,"FluTreeView");
@@ -71,7 +77,6 @@ void Fluent::registerTypes(const char *uri){
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluSlider.qml"),uri,major,minor,"FluSlider");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluTextBox.qml"),uri,major,minor,"FluTextBox");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluText.qml"),uri,major,minor,"FluText");
-    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluTimePicker.qml"),uri,major,minor,"FluTimePicker");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluFilledButton.qml"),uri,major,minor,"FluFilledButton");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluToggleSwitch.qml"),uri,major,minor,"FluToggleSwitch");
 
@@ -86,9 +91,9 @@ void Fluent::initializeEngine(QQmlEngine *engine, const char *uri)
     QFont font;
     font.setFamily("Microsoft YaHei");
     QGuiApplication::setFont(font);
-    QQuickWindow::setTextRenderType(QQuickWindow::NativeTextRendering);
+//    QQuickWindow::setTextRenderType(QQuickWindow::NativeTextRendering);
 #endif
-    QFontDatabase::addApplicationFont(":/com.zhuzichu/res/font/fontawesome-webfont.ttf");
+    QFontDatabase::addApplicationFont(":/com.zhuzichu/res/font/Segoe_Fluent_Icons.ttf");
     FluApp* app = FluApp::getInstance();
     engine->rootContext()->setContextProperty("FluApp",app);
     FluColors* colors = FluColors::getInstance();

src/controls/FluAppBar.qml

@@ -101,7 +101,7 @@ Rectangle{
         }
 
         FluIconButton{
-            icon : FluentIcons.FA_window_minimize
+            icon : FluentIcons.ChromeMinimizeContrast
             Layout.alignment: Qt.AlignVCenter
             iconSize: 15
             text:"最小化"
@@ -117,7 +117,7 @@ Rectangle{
                     return false
                 return Window.Maximized === window.visibility
             }
-            icon : isRestore  ? FluentIcons.FA_window_restore : FluentIcons.FA_window_maximize
+            icon : isRestore  ? FluentIcons.ChromeRestoreContrast : FluentIcons.ChromeMaximizeContrast
             color:hovered ? "#20000000" : "#00000000"
             Layout.alignment: Qt.AlignVCenter
             visible: resizable
@@ -129,9 +129,10 @@ Rectangle{
             }
         }
         FluIconButton{
-            icon : FluentIcons.FA_close
+            icon : FluentIcons.ChromeCloseContrast
             Layout.alignment: Qt.AlignVCenter
             text:"关闭"
+            iconSize: 13
             textColor: root.textColor
             color:hovered ? "#20000000" : "#00000000"
             onClicked: {

src/controls/FluAutoSuggestBox.qml

@@ -7,6 +7,8 @@ TextField{
     property var values:[]
     property int fontStyle: FluText.Body
     property int pixelSize : FluTheme.textSize
+    property int icon: -1
+    signal itemClicked(string data)
 
     id:input
     width: 300
@@ -18,13 +20,14 @@ TextField{
             return FluTheme.primaryColor.dark
         }
     }
+    renderType: FluTheme.isNativeText ? Text.NativeRendering : Text.QtRendering
     placeholderTextColor: {
         if(focus){
             return FluTheme.isDark ? Qt.rgba(152/255,152/255,152/255,1) : Qt.rgba(141/255,141/255,141/255,1)
         }
         return FluTheme.isDark ? Qt.rgba(210/255,210/255,210/255,1) : Qt.rgba(96/255,96/255,96/255,1)
     }
-    rightPadding: 30
+    rightPadding: icon_right.visible ? 50 : 30
     selectByMouse: true
     font.bold: {
         switch (fontStyle) {
@@ -74,8 +77,8 @@ TextField{
         inputItem: input
 
         FluIconButton{
-            icon:FluentIcons.FA_close
-            iconSize: 14
+            icon:FluentIcons.ChromeClose
+            iconSize: 10
             width: 20
             height: 20
             opacity: 0.5
@@ -83,12 +86,25 @@ TextField{
             anchors{
                 verticalCenter: parent.verticalCenter
                 right: parent.right
-                rightMargin: 5
+                rightMargin: icon_right.visible ? 25 : 5
             }
             onClicked:{
                 input.text = ""
             }
         }
+
+        FluIcon{
+            id:icon_right
+            icon: input.icon
+            iconSize: 15
+            opacity: 0.5
+            visible: input.icon != -1
+            anchors{
+                verticalCenter: parent.verticalCenter
+                right: parent.right
+                rightMargin: 5
+            }
+        }
     }
 
     Component.onCompleted: {
@@ -108,7 +124,7 @@ TextField{
             FluShadow{
                 radius: 4
             }
-            color: FluTheme.isDark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(243/255,241/255,240/255,1)
+            color: FluTheme.isDark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(248/255,250/255,253/255,1)
             height: 38*Math.min(Math.max(list_view.count,1),8)
             ListView{
                 id:list_view
@@ -137,11 +153,13 @@ TextField{
                         anchors.fill: parent
                         anchors.topMargin: 2
                         anchors.bottomMargin: 2
+                        anchors.leftMargin: 5
+                        anchors.rightMargin: 5
                         color:  {
                             if(item_mouse.containsMouse){
-                                return FluTheme.isDark ? Qt.rgba(63/255,60/255,61/255,1) : Qt.rgba(234/255,234/255,234/255,1)
+                                return FluTheme.isDark ? Qt.rgba(63/255,60/255,61/255,1) : Qt.rgba(237/255,237/255,242/255,1)
                             }
-                            return FluTheme.isDark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(243/255,241/255,240/255,1)
+                            return FluTheme.isDark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(0,0,0,0)
                         }
                         radius: 3
                         MouseArea{
@@ -150,6 +168,7 @@ TextField{
                             hoverEnabled: true
                             onClicked: {
                                 input_popup.close()
+                                input.itemClicked(modelData)
                                 input.text = modelData
                             }
                         }
@@ -173,6 +192,10 @@ TextField{
 
     function searchData(){
         var result = []
+        if(values==null){
+            list_view.model = result
+            return
+        }
         values.map(function(item){
             if(item.indexOf(input.text)!==-1){
                 result.push(item)

src/controls/FluButton.qml

@@ -61,8 +61,10 @@ Rectangle {
         id:button_mouse
         anchors.fill: parent
         hoverEnabled: true
-        enabled: !disabled
         onClicked: {
+            if(disabled){
+                return
+            }
             button.clicked()
         }
     }

src/controls/FluCalendarDatePicker.qml

@@ -0,0 +1,5 @@
+import QtQuick 2.15
+
+Item {
+
+}

src/controls/FluCalenderView.qml

@@ -0,0 +1,5 @@
+import QtQuick 2.15
+
+Item {
+
+}

src/controls/FluCheckBox.qml

@@ -66,7 +66,7 @@ Item {
 
             FluIcon {
                 anchors.centerIn: parent
-                icon: FluentIcons.FA_check
+                icon: FluentIcons.AcceptMedium
                 iconSize: 15
                 visible: checked
                 color: FluTheme.isDark ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1)

src/controls/FluDatePicker.qml

@@ -0,0 +1,5 @@
+import QtQuick 2.15
+
+Item {
+
+}

src/controls/FluDivider.qml

@@ -3,6 +3,6 @@ import FluentUI 1.0
 
 Rectangle {
 
-    color: FluTheme.isDark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(238/255,238/255,238/255,1)
+    color: FluTheme.isDark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,230/255,234/255,1)
 
 }

src/controls/FluExpander.qml

@@ -22,9 +22,8 @@ Item {
         width: parent.width
         height: 45
         radius: 4
-        border.color: FluTheme.isDark ? Qt.rgba(53/255,53/255,53/255,1) : Qt.rgba(240/255,240/255,240/255,1)
-        color: FluTheme.isDark ? Qt.rgba(61/255,61/255,61/255,1) : Qt.rgba(254/255,254/255,254/255,1)
-
+        color: FluTheme.isDark ? Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
+        border.color: FluTheme.isDark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1)
 
         MouseArea{
             id:root_mouse
@@ -53,7 +52,8 @@ Item {
             hoverColor: FluTheme.isDark ? Qt.rgba(73/255,73/255,73/255,1) : Qt.rgba(245/255,245/255,245/255,1)
             normalColor: FluTheme.isDark ? Qt.rgba(61/255,61/255,61/255,1) : Qt.rgba(254/255,254/255,254/255,1)
             hovered: root_mouse.containsMouse
-            icon: expand ? FluentIcons.FA_angle_up : FluentIcons.FA_angle_down
+            iconSize: 15
+            icon: expand ? FluentIcons.ChevronUp : FluentIcons.ChevronDown
             onClicked: {
                 expand = !expand
             }
@@ -71,8 +71,8 @@ Item {
             left: layout_header.left
         }
         radius: 4
-        border.color: FluTheme.isDark ? Qt.rgba(53/255,53/255,53/255,1) : Qt.rgba(240/255,240/255,240/255,1)
-        color: FluTheme.isDark ? Qt.rgba(57/255,57/255,57/255,1) : Qt.rgba(249/255,249/255,249/255,1)
+        color: FluTheme.isDark ? Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
+        border.color: FluTheme.isDark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1)
         height: expand ? contentHeight : 0
         Behavior on height {
             NumberAnimation{

src/controls/FluIcon.qml

@@ -7,7 +7,7 @@ Text {
     property color iconColor: FluTheme.isDark ? "#FFFFFF" : "#000000"
 
     id:text_icon
-    font.family: "fontawesome"
+    font.family: "Segoe Fluent Icons"
     font.pixelSize: iconSize
     horizontalAlignment: Text.AlignHCenter
     verticalAlignment: Text.AlignVCenter

src/controls/FluIconButton.qml

@@ -42,7 +42,7 @@ Rectangle {
 
     Text {
         id:text_icon
-        font.family: "fontawesome"
+        font.family: "Segoe Fluent Icons"
         font.pixelSize: iconSize
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
@@ -55,8 +55,10 @@ Rectangle {
         id:button_mouse
         anchors.fill: parent
         hoverEnabled: true
-        enabled: !disabled
         onClicked: {
+            if(disabled){
+                return
+            }
             button.clicked()
         }
     }

src/controls/FluInfoBar.qml

@@ -192,11 +192,11 @@ FluObject {
                 FluIcon{
                     icon:{
                         switch(_super.type){
-                        case mcontrol.const_success: return FluentIcons.FA_check_circle;
-                        case mcontrol.const_warning: return FluentIcons.FA_info_circle;
-                        case mcontrol.const_info:    return FluentIcons.FA_info_circle;
-                        case mcontrol.const_error:   return FluentIcons.FA_times_circle;
-                        }
+                        case mcontrol.const_success: return FluentIcons.CompletedSolid;
+                        case mcontrol.const_warning: return FluentIcons.InfoSolid;
+                        case mcontrol.const_info:    return FluentIcons.InfoSolid;
+                        case mcontrol.const_error:   return FluentIcons.StatusErrorFull;
+                        }FluentIcons.StatusErrorFull
                         return FluentIcons.FA_info_circle
                     }
                     iconSize:20

src/controls/FluMultiLineTextBox.qml

@@ -11,6 +11,7 @@ TextArea{
     width: 300
     color: FluTheme.isDark ? "#FFFFFF" : "#1A1A1A"
     wrapMode: Text.WrapAnywhere
+    renderType: FluTheme.isNativeText ? Text.NativeRendering : Text.QtRendering
     selectByMouse: true
     selectionColor: {
         if(FluTheme.isDark){

src/controls/FluNavigationView.qml

@@ -105,11 +105,11 @@ Item {
                 }
                 color: {
                     if(FluTheme.isDark){
-                        if((nav_list.currentIndex === position)&&type===0){
-                            return "#2D2D2D"
-                        }
                         if(item_mouse.containsMouse){
-                            return "#292929"
+                            return Qt.rgba(1,1,1,0.03)
+                        }
+                        if((nav_list.currentIndex === position)&&type===0){
+                            return Qt.rgba(1,1,1,0.06)
                         }
                         return Qt.rgba(0,0,0,0)
                     }else{
@@ -145,10 +145,11 @@ Item {
             height:parent.height
             spacing: 0
             FluIconButton{
-                icon: FluentIcons.FA_arrow_left
+                icon: FluentIcons.ChromeBack
                 Layout.leftMargin: 5
                 Layout.alignment: Qt.AlignVCenter
                 disabled:  nav_swipe.depth === 1
+                iconSize: 13
                 onClicked: {
                     nav_swipe.pop()
                     nav_list.stackIndex.pop()
@@ -159,8 +160,9 @@ Item {
                 }
             }
             FluIconButton{
-                icon: FluentIcons.FA_navicon
+                icon: FluentIcons.GlobalNavButton
                 Layout.leftMargin: 5
+                iconSize: 15
                 visible: displayMode === FluNavigationView.Minimal
                 Layout.alignment: Qt.AlignVCenter
                 onClicked: {
@@ -207,8 +209,12 @@ Item {
             clip: true
             anchors.margins: 10
             popEnter : Transition{}
-            popExit : Transition{}
-            pushEnter : Transition{}
+            popExit : Transition {
+                NumberAnimation { properties: "y"; from: 0; to: nav_swipe.height; duration: 200 }
+            }
+            pushEnter: Transition {
+                NumberAnimation { properties: "y"; from: nav_swipe.height; to: 0; duration: 200 }
+            }
             pushExit : Transition{}
             replaceEnter : Transition{}
             replaceExit : Transition{}
@@ -255,13 +261,58 @@ Item {
                 duration: 300
             }
         }
+
+        Item{
+            id:layout_header
+            width: layout_list.width
+            height: 50
+
+            FluAutoSuggestBox{
+                width: 280
+                anchors.centerIn: parent
+                icon: FluentIcons.Zoom
+                values: {
+                    var arr = []
+                    if(items==null)
+                        return arr
+                    if(items.children==null)
+                        return arr
+                    for(var i=0;i<items.children.length;i++){
+                        var item = items.children[i]
+                        if(item instanceof FluPaneItem){
+                            arr.push(item.title)
+                        }
+                    }
+                    return arr
+                }
+                placeholderText: "查找"
+                onItemClicked:
+                    (data)=>{
+                        var arr = []
+                        if(items==null)
+                        return arr
+                        if(items.children==null)
+                        return arr
+                        for(var i=0;i<items.children.length;i++){
+                            if(items.children[i].title === data){
+                                if(nav_list.currentIndex === i){
+                                    return
+                                }
+                                items.children[i].tap()
+                                nav_list.currentIndex = i
+                                return
+                            }
+                        }
+                    }
+            }
+        }
         ListView{
             id:nav_list
             property bool enableStack: true
             property var stackIndex: []
             clip: true
             anchors{
-                top: parent.top
+                top: layout_header.bottom
                 left: parent.left
                 right: parent.right
                 bottom: layout_footer.top

src/controls/FluSlider.qml

@@ -8,7 +8,7 @@ Item{
 
     property int lineSize: 5
     property int size: 180
-    property int dotSize: 26
+    property int dotSize: 28
 
     property int value: 50
 

src/controls/FluText.qml

@@ -20,6 +20,7 @@ Text {
 
     id:text
     color: textColor
+    renderType: FluTheme.isNativeText ? Text.NativeRendering : Text.QtRendering
     font.bold: {
         switch (fontStyle) {
         case FluText.Display:

src/controls/FluTextBox.qml

@@ -10,6 +10,7 @@ TextField{
     id:input
     width: 300
     color: FluTheme.isDark ? "#FFFFFF" : "#1A1A1A"
+    renderType: FluTheme.isNativeText ? Text.NativeRendering : Text.QtRendering
     selectionColor: {
         if(FluTheme.isDark){
             return FluTheme.primaryColor.lighter

src/controls/FluTimePicker.qml

@@ -1,8 +1,356 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
-import QtQuick.Shapes 1.15
+import QtQuick.Layouts 1.15
+import QtQuick.Window 2.15
 import FluentUI 1.0
 
-Item {
+Rectangle {
+
+    id:root
+
+    property color dividerColor: FluTheme.isDark ? Qt.rgba(77/255,77/255,77/255,1) : Qt.rgba(239/255,239/255,239/255,1)
+    property color hoverColor: FluTheme.isDark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(251/255,251/255,251/255,1)
+    property color normalColor: FluTheme.isDark ? Qt.rgba(61/255,61/255,61/255,1) : Qt.rgba(254/255,254/255,254/255,1)
+    property var window : Window.window
+
+    property int hourFormat: FluTimePicker.H
+
+    property int isH: hourFormat === FluTimePicker.H
+
+    enum HourFormat {
+        H,
+        HH
+    }
+
+    color: {
+        if(mouse_area.containsMouse){
+            return hoverColor
+        }
+        return normalColor
+    }
+    height: 30
+    width: 300
+    radius: 4
+    border.width: 1
+    border.color: dividerColor
+
+    MouseArea{
+        id:mouse_area
+        hoverEnabled: true
+        anchors.fill: parent
+        onClicked: {
+            popup.showPopup()
+        }
+    }
+
+    Rectangle{
+        id:divider_1
+        width: 1
+        x: isH ? parent.width/3 : parent.width/2
+        height: parent.height
+        color: dividerColor
+    }
+
+
+    Rectangle{
+        id:divider_2
+        width: 1
+        x:parent.width*2/3
+        height: parent.height
+        color: dividerColor
+        visible: isH
+    }
+
+    FluText{
+        id:text_hour
+        anchors{
+            left: parent.left
+            right: divider_1.left
+            top: parent.top
+            bottom: parent.bottom
+        }
+        verticalAlignment: Text.AlignVCenter
+        horizontalAlignment: Text.AlignHCenter
+        text:"时"
+    }
+
+
+    FluText{
+        id:text_minute
+        anchors{
+            left: divider_1.right
+            right: isH ? divider_2.left : parent.right
+            top: parent.top
+            bottom: parent.bottom
+        }
+        verticalAlignment: Text.AlignVCenter
+        horizontalAlignment: Text.AlignHCenter
+        text:"分"
+    }
+
+
+    FluText{
+        id:text_ampm
+        visible: isH
+        anchors{
+            left: divider_2.right
+            right: parent.right
+            top: parent.top
+            bottom: parent.bottom
+        }
+        verticalAlignment: Text.AlignVCenter
+        horizontalAlignment: Text.AlignHCenter
+        text:"上午"
+    }
+
+    Popup{
+        id:popup
+        background: Rectangle{
+            width: 300
+            radius: 4
+            color: FluTheme.isDark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(248/255,250/255,253/255,1)
+            height: 340
+            MouseArea{
+                anchors.fill: parent
+            }
+            FluShadow{
+                radius: 4
+            }
+
+            RowLayout{
+                id:layout_content
+                spacing: 0
+                width: parent.width
+                height: 300
+
+                Component{
+                    id:list_delegate
+
+                    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.isDark){
+                                        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.isDark ? Qt.rgba(63/255,60/255,61/255,1) : Qt.rgba(237/255,237/255,242/255,1)
+                                }
+                                return FluTheme.isDark ? 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
+                                    }
+                                }
+                            }
+                            FluText{
+                                text:model
+                                color: {
+                                    if(getListView().currentIndex === position){
+                                        if(FluTheme.isDark){
+                                            return Qt.rgba(0,0,0,1)
+                                        }else{
+                                            return Qt.rgba(1,1,1,1)
+                                        }
+                                    }else{
+                                        return FluTheme.isDark ? "#FFFFFF" : "#1A1A1A"
+                                    }
+                                }
+                                anchors.centerIn: parent
+                            }
+                        }
+                    }
+                }
+
+                ListView{
+                    id:list_view_1
+                    width: isH ? 100 : 150
+                    height: parent.height
+                    boundsBehavior:Flickable.StopAtBounds
+                    ScrollBar.vertical: ScrollBar { }
+                    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
+                    ScrollBar.vertical: ScrollBar { }
+                    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
+                    ScrollBar.vertical: ScrollBar { }
+                    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.isDark ? 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{
+                    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() {
+            changeFlag = true
+            rowData[0] = text_hour.text
+            rowData[1] = text_minute.text
+            rowData[2] = text_ampm.text
+            list_view_1.currentIndex = -1
+            list_view_2.currentIndex = -1
+            list_view_3.currentIndex = -1
+            var pos = root.mapToItem(null, 0, 0)
+            if(window.height>pos.y+35+340){
+                popup.y = 35
+            }else{
+                popup.y = window.height-(pos.y+340)
+            }
+            popup.open()
+        }
+
+        onClosed: {
+            if(changeFlag){
+                text_hour.text = rowData[0]
+                text_minute.text = rowData[1]
+                text_ampm.text = rowData[2]
+            }
+        }
+
+    }
+
+    property bool changeFlag: true
+    readonly property var rowData: ["","",""]
+
+
+    function generateArray(start, n) {
+        var arr = [];
+        for (var i = start; i <= n; i++) {
+            arr.push(i.toString().padStart(2, '0'));
+        }
+        return arr;
+    }
 
 }

src/controls/FluTreeView.qml

@@ -222,8 +222,9 @@ Item {
                     FluIconButton{
                         id:item_layout_expanded
                         color:"#00000000"
-                        icon:item_layout.expanded?FluentIcons.FA_angle_down:FluentIcons.FA_angle_right
+                        icon:item_layout.expanded?FluentIcons.ChevronDown:FluentIcons.ChevronRight
                         opacity: item_layout.hasChild
+                        iconSize: 15
                         onClicked: {
                             if(!item_layout.hasChild){
                                 item_layout_rect.onClickItem()

src/res.qrc

@@ -14,7 +14,6 @@
         <file>controls/FluDropDownButton.qml</file>
         <file>controls/FluTextBox.qml</file>
         <file>controls/FluTimePicker.qml</file>
-        <file>res/font/fontawesome-webfont.ttf</file>
         <file>controls/FluAppBar.qml</file>
         <file>controls/FluRectangle.qml</file>
         <file>controls/FluWindow.qml</file>
@@ -43,5 +42,9 @@
         <file>controls/FluScrollablePage.qml</file>
         <file>controls/FluContentPage.qml</file>
         <file>controls/FluArea.qml</file>
+        <file>res/font/Segoe_Fluent_Icons.ttf</file>
+        <file>controls/FluDatePicker.qml</file>
+        <file>controls/FluCalenderView.qml</file>
+        <file>controls/FluCalendarDatePicker.qml</file>
     </qresource>
 </RCC>