Merge pull request #583 from luckyloogn/fix/flupivot-animation-issues

修复FluPivot 切换选中项目时标题下划线动画未能完全关闭的问题
zhuzichu520 · Jan 2, 2025 · 7204e18 · 7204e18
2 parents 985e90b + e82000e
commit 7204e18
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/src/Qt5/imports/FluentUI/Controls/FluPivot.qml b/src/Qt5/imports/FluentUI/Controls/FluPivot.qml
@@ -31,21 +31,15 @@ Page {
         interactive: false
         orientation: ListView.Horizontal
         highlightMoveDuration: FluTheme.animationEnabled ? 167 : 0
+        highlightResizeDuration: FluTheme.animationEnabled ? 167 : 0
         highlight: Item{
             clip: true
             Rectangle{
                 height: 3
                 radius: 1.5
                 color: FluTheme.primaryColor
-                width: nav_list.currentItem ? nav_list.currentItem.width : 0
+                width: nav_list.currentItem.width
                 y:d.tabY
-                Behavior on width {
-                    enabled: FluTheme.animationEnabled
-                    NumberAnimation{
-                        duration: 167
-                        easing.type: Easing.OutCubic
-                    }
-                }
             }
         }
         delegate: Button{

diff --git a/src/Qt6/imports/FluentUI/Controls/FluPivot.qml b/src/Qt6/imports/FluentUI/Controls/FluPivot.qml
@@ -32,21 +32,15 @@ Page {
         interactive: false
         orientation: ListView.Horizontal
         highlightMoveDuration: FluTheme.animationEnabled ? 167 : 0
+        highlightResizeDuration: FluTheme.animationEnabled ? 167 : 0
         highlight: Item{
             clip: true
             Rectangle{
                 height: 3
                 radius: 1.5
                 color: FluTheme.primaryColor
-                width: nav_list.currentItem ? nav_list.currentItem.width : 0
+                width: nav_list.currentItem.width
                 y:d.tabY
-                Behavior on width {
-                    enabled: FluTheme.animationEnabled
-                    NumberAnimation{
-                        duration: 167
-                        easing.type: Easing.OutCubic
-                    }
-                }
             }
         }
         delegate: Button{