update

example/CMakeLists.txt

@@ -20,7 +20,7 @@ endif()
 file(TO_CMAKE_PATH "/" PATH_SEPARATOR)
 
 #设置版本号
-add_definitions(-DVERSION=1,3,5,0)
+add_definitions(-DVERSION=1,3,5,1)
 
 find_package(Qt6 REQUIRED COMPONENTS Quick)
 qt_standard_project_setup()

example/qml/page/T_Progress.qml

@@ -33,12 +33,14 @@ FluScrollablePage{
                 indeterminate: false
             }
             FluSlider{
-                value:50
                 onValueChanged:{
                     var progress = value/100
                     progress_bar.progress = progress
                     progress_ring.progress = progress
                 }
+                Component.onCompleted: {
+                    value = 50
+                }
             }
         }
     }

example/qml/page/T_TableView.qml

@@ -87,7 +87,7 @@ FluScrollablePage{
                     text:"删除"
                     horizontalPadding: 6
                     onClicked:{
-                        table_view.remove(dataModel.index)
+                        tableView.remove(dataModel.index)
                     }
                 }
             }

src/CMakeLists.txt

@@ -13,7 +13,7 @@ endif()
 set(QML_PLUGIN_DIRECTORY ${CMAKE_PREFIX_PATH}/qml/FluentUI)
 
 #设置版本号
-add_definitions(-DVERSION=1,3,5,0)
+add_definitions(-DVERSION=1,3,5,1)
 
 find_package(Qt6 REQUIRED COMPONENTS Core Quick Qml)
 qt_standard_project_setup()

src/imports/FluentUI/Controls/FluMenu.qml

@@ -6,33 +6,31 @@ import FluentUI
 
 T.Menu {
     id: control
-
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
                             contentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
                              contentHeight + topPadding + bottomPadding)
-
     margins: 0
     overlap: 1
     spacing: 0
     delegate: FluMenuItem { }
     enter: Transition {
-         reversible: true
+        reversible: true
-         NumberAnimation {
+        NumberAnimation {
-             property: "opacity"
+            property: "opacity"
-             from:0
+            from:0
-             to:1
+            to:1
-             duration:  83
+            duration:  83
-         }
+        }
-     }
+    }
-     exit:Transition {
+    exit:Transition {
-         NumberAnimation {
+        NumberAnimation {
-             property: "opacity"
+            property: "opacity"
-             from:1
+            from:1
-             to:0
+            to:0
-             duration: 83
+            duration: 83
-         }
+        }
-     }
+    }
     contentItem: ListView {
         implicitHeight: contentHeight
         model: control.contentModel
@@ -43,8 +41,6 @@ T.Menu {
         currentIndex: control.currentIndex
         ScrollIndicator.vertical: ScrollIndicator {}
     }
-
-
     background: Rectangle {
         implicitWidth: 150
         implicitHeight: 40
@@ -54,11 +50,9 @@ T.Menu {
         radius: 5
         FluShadow{}
     }
-
     T.Overlay.modal: Rectangle {
         color: Color.transparent(control.palette.shadow, 0.5)
     }
-
     T.Overlay.modeless: Rectangle {
         color: Color.transparent(control.palette.shadow, 0.12)
     }

src/imports/FluentUI/Controls/FluMenuBar.qml

@@ -4,21 +4,17 @@ import QtQuick.Controls.impl
 
 T.MenuBar {
     id: control
-
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
                             contentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
                              contentHeight + topPadding + bottomPadding)
-
     delegate: FluMenuBarItem { }
-
     contentItem: Row {
         spacing: control.spacing
         Repeater {
             model: control.contentModel
         }
     }
-
     background: Item {
         implicitHeight: 30
     }

src/imports/FluentUI/Controls/FluMenuBarItem.qml

@@ -5,27 +5,22 @@ import FluentUI
 
 T.MenuBarItem {
     id: control
-
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
                             implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
                              implicitContentHeight + topPadding + bottomPadding,
                              implicitIndicatorHeight + topPadding + bottomPadding)
-
     spacing: 6
     padding: 6
     leftPadding: 12
     rightPadding: 16
-
     icon.width: 24
     icon.height: 24
     icon.color: control.palette.buttonText
-
     contentItem: FluText {
         verticalAlignment: Text.AlignVCenter
         text: control.text
     }
-
     background: Rectangle {
         implicitWidth: 30
         implicitHeight: 30

src/imports/FluentUI/Controls/FluMenuItem.qml

@@ -15,13 +15,10 @@ T.MenuItem {
 
     padding: 6
     spacing: 6
-
     icon.width: 24
     icon.height: 24
     icon.color: control.palette.windowText
-
     height: visible ? implicitHeight : 0
-
     contentItem: FluText {
         readonly property real arrowPadding: control.subMenu && control.arrow ? control.arrow.width + control.spacing : 0
         readonly property real indicatorPadding: control.checkable && control.indicator ? control.indicator.width + control.spacing : 0
@@ -30,21 +27,18 @@ T.MenuItem {
         verticalAlignment: Text.AlignVCenter
         text: control.text
     }
-
     indicator: FluIcon {
         x: control.mirrored ? control.width - width - control.rightPadding : control.leftPadding
         y: control.topPadding + (control.availableHeight - height) / 2
         visible: control.checked
         iconSource: FluentIcons.CheckMark
     }
-
     arrow: FluIcon {
         x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
         y: control.topPadding + (control.availableHeight - height) / 2
         visible: control.subMenu
         iconSource: FluentIcons.ChevronRightMed
     }
-
     background: Rectangle {
         implicitWidth: 150
         implicitHeight: 40

src/imports/FluentUI/Controls/FluMenuSeparator.qml

@@ -5,15 +5,12 @@ import FluentUI
 
 T.MenuSeparator {
     id: control
-
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
                             implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
                              implicitContentHeight + topPadding + bottomPadding)
-
     padding: 0
     verticalPadding: 0
-
     contentItem: Rectangle {
         implicitWidth: 188
         implicitHeight: 1

src/imports/FluentUI/Controls/FluObject.qml

@@ -3,6 +3,6 @@ import QtQuick.Controls
 import FluentUI
 
 QtObject {
-    default property list<QtObject> children;
+    default property list<QtObject> children
-    id:flu_object;
+    id:control
 }

src/imports/FluentUI/Controls/FluSlider.qml

@@ -4,6 +4,7 @@ import QtQuick.Templates as T
 import FluentUI
 
 T.Slider {
+    property bool tooltipEnabled: true
     id: control
     to:100
     stepSize:1
@@ -11,9 +12,7 @@ T.Slider {
                             implicitHandleWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
                              implicitHandleHeight + topPadding + bottomPadding)
-
     padding: 6
-
     handle: Rectangle {
         x: control.leftPadding + (control.horizontal ? control.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2)
         y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : control.visualPosition * (control.availableHeight - height))
@@ -43,7 +42,11 @@ T.Slider {
             }
         }
     }
-
+    FluTooltip{
+        parent: control.handle
+        visible: control.tooltipEnabled && control.pressed
+        text:String(control.value)
+    }
     background: Rectangle {
         x: control.leftPadding + (control.horizontal ? 0 : (control.availableWidth - width) / 2)
         y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : 0)

src/imports/FluentUI/Controls/FluTabView.qml

@@ -110,6 +110,11 @@ Item {
                         anchors.fill: parent
                         hoverEnabled: true
                     }
+                    FluTooltip{
+                        visible: item_mouse_hove.containsMouse
+                        text:item_text.text
+                        delay: 1000
+                    }
                     MouseArea{
                         id:item_mouse_drag
                         anchors.fill: parent
@@ -242,11 +247,6 @@ Item {
                             Layout.preferredWidth: visible?item_container.width - 41 - item_btn_close.width:0
                             elide: Text.ElideRight
                             Layout.alignment: Qt.AlignVCenter
-                            FluTooltip{
-                                visible: item_mouse_hove.containsMouse
-                                text:item_text.text
-                                delay: 1000
-                            }
                         }
                     }
                     FluIconButton{

src/imports/FluentUI/Controls/FluTableView.qml

@@ -37,7 +37,6 @@ Item {
         model_data_source.clear()
         model_data_source.append(dataSource)
     }
-
     Component{
         id:header_columns
         FluRectangle{
@@ -114,7 +113,6 @@ Item {
             }
         }
     }
-
     Flickable{
         id:layout_flickable
         height: layout_table.height
@@ -219,6 +217,7 @@ Item {
                                 property var model : modelData
                                 property var dataModel : listModel
                                 property var dataObject : itemObject
+                                property var tableView : control
                                 anchors.verticalCenter: parent.verticalCenter
                                 width: parent.width
                                 sourceComponent: {
@@ -245,7 +244,6 @@ Item {
             }
         }
     }
-
     Component{
         id:com_text
         Item{

src/imports/FluentUI/Controls/FluTimePicker.qml

@@ -5,7 +5,6 @@ import QtQuick.Window
 import FluentUI
 
 Rectangle {
-
     enum HourFormat {
         H,
         HH
@@ -16,7 +15,6 @@ Rectangle {
     property var window : Window.window
     property int hourFormat: FluTimePicker.H
     property int isH: hourFormat === FluTimePicker.H
-
     id:root
     color: {
         if(mouse_area.containsMouse){
@@ -29,7 +27,6 @@ Rectangle {
     radius: 4
     border.width: 1
     border.color: dividerColor
-
     MouseArea{
         id:mouse_area
         hoverEnabled: true

src/imports/FluentUI/Controls/FluToggleSwitch.qml

@@ -7,15 +7,16 @@ import FluentUI
 Button {
     property bool disabled: false
     property string contentDescription: ""
-    property color disableColor: checked ? FluTheme.dark ? Qt.rgba(59/255,59/255,59/255,1) : Qt.rgba(159/255,159/255,159/255,1) :FluTheme.dark ? Qt.rgba(82/255,82/255,82/255,1) : Qt.rgba(240/255,240/255,240/255,1)
+    property color disableColor: checked ? FluTheme.dark ? Qt.rgba(59/255,59/255,59/255,1) : Qt.rgba(233/255,233/255,233/255,1) :FluTheme.dark ? Qt.rgba(82/255,82/255,82/255,1) : Qt.rgba(233/255,233/255,233/255,1)
     property color checkColor: FluTheme.dark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark
     property color hoverColor: FluTheme.dark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(240/255,240/255,240/255,1)
     property color normalColor: FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(253/255,253/255,253/255,1)
     property color borderNormalColor: FluTheme.dark ? Qt.rgba(161/255,161/255,161/255,1) : Qt.rgba(141/255,141/255,141/255,1)
     property color borderCheckColor: FluTheme.dark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark
-    property color borderDisableColor: FluTheme.dark ? Qt.rgba(208/255,208/255,208/255,1) : Qt.rgba(93/255,93/255,93/255,1)
+    property color borderDisableColor: FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(200/255,200/255,200/255,1)
     property color dotNormalColor: FluTheme.dark ? Qt.rgba(208/255,208/255,208/255,1) : Qt.rgba(93/255,93/255,93/255,1)
     property color dotCheckColor: FluTheme.dark ? Qt.rgba(0/255,0/255,0/255,1) : Qt.rgba(255/255,255/255,255/255,1)
+    property color dotDisableColor: FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(150/255,150/255,150/255,1)
     property var clickListener : function(){
         checked = !checked
     }
@@ -76,6 +77,9 @@ Button {
                 scale: hovered&!disabled ? 7/10 : 6/10
                 anchors.verticalCenter: parent.verticalCenter
                 color: {
+                    if(disabled){
+                        return dotDisableColor
+                    }
                     if(checked){
                         return dotCheckColor
                     }

src/imports/FluentUI/Controls/FluTooltip.qml

@@ -1,18 +1,30 @@
 import QtQuick
-import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
 import FluentUI
 
-ToolTip {
+T.ToolTip {
-    id:tool_tip
+    id: control
+    x: parent ? (parent.width - implicitWidth) / 2 : 0
+    y: -implicitHeight - 3
+    implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
+                            contentWidth + leftPadding + rightPadding)
+    implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
+                             contentHeight + topPadding + bottomPadding)
+    margins: 6
+    padding: 6
+    font: FluTextStyle.Body
+    closePolicy: T.Popup.CloseOnEscape | T.Popup.CloseOnPressOutsideParent | T.Popup.CloseOnReleaseOutsideParent
     contentItem: FluText {
-        text: tool_tip.text
+        text: control.text
-        padding: 4
+        font: control.font
-        wrapMode: Text.WrapAnywhere
+        wrapMode: Text.Wrap
     }
-    background: Rectangle{
+    background: Rectangle {
-        anchors.fill: parent
         color: FluTheme.dark ? Qt.rgba(50/255,49/255,48/255,1) : Qt.rgba(1,1,1,1)
-        radius: 5
+        radius: 3
-        FluShadow{}
+        FluShadow{
+            radius: 3
+        }
     }
 }