From 6a95c5423c6ea5dcc5923bb79930de82b81974eb Mon Sep 17 00:00:00 2001
From: deepin-ci-robot <packages@deepin.org>
Date: Wed, 3 Sep 2025 08:14:51 +0000
Subject: [PATCH] sync: from linuxdeepin/dtkdeclarative

Synchronize source files from linuxdeepin/dtkdeclarative.

Source-pull-request: https://github.com/linuxdeepin/dtkdeclarative/pull/525
---
 qt6/src/qml/ScrollBar.qml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/qt6/src/qml/ScrollBar.qml b/qt6/src/qml/ScrollBar.qml
index 8552a812..bec94cf2 100644
--- a/qt6/src/qml/ScrollBar.qml
+++ b/qt6/src/qml/ScrollBar.qml
@@ -31,7 +31,7 @@ T.ScrollBar {
         State {
             name: "normal"
             property bool moving: control.active && !control.pressed && !control.hovered
-            when: control.policy === T.ScrollBar.AlwaysOn || ( moving && control.size < 1.0)
+            when: (control.policy === T.ScrollBar.AlwaysOn && !control.hovered && !control.pressed) || (moving && control.size < 1.0)
             PropertyChanges {
                 target: control.contentItem
                 implicitWidth: DS.Style.scrollBar.width
@@ -39,7 +39,7 @@ T.ScrollBar {
         },
         State {
             name: "hover"
-            when: control.policy === T.ScrollBar.AlwaysOn || ( control.hovered && !control.pressed && control.size < 1.0)
+            when: (control.hovered && !control.pressed && control.size < 1.0)
             PropertyChanges {
                 target: control.contentItem
                 implicitWidth: DS.Style.scrollBar.activeWidth
@@ -47,7 +47,7 @@ T.ScrollBar {
         },
         State {
             name: "active"
-            when: control.policy === T.ScrollBar.AlwaysOn || (control.pressed && control.size < 1.0)
+            when: (control.pressed && control.size < 1.0)
             PropertyChanges {
                 target: control.contentItem
                 implicitWidth: DS.Style.scrollBar.activeWidth