diff options
| -rw-r--r-- | src/imports/controls/material/ScrollBar.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/universal/ScrollBar.qml | 1 | ||||
| -rw-r--r-- | tests/auto/controls/data/tst_scrollbar.qml | 40 |
3 files changed, 42 insertions, 0 deletions
diff --git a/src/imports/controls/material/ScrollBar.qml b/src/imports/controls/material/ScrollBar.qml index 156c5781..8374c0f9 100644 --- a/src/imports/controls/material/ScrollBar.qml +++ b/src/imports/controls/material/ScrollBar.qml @@ -81,6 +81,7 @@ T.ScrollBar { Transition { from: "active" SequentialAnimation { + PropertyAction{ targets: [contentItem, background]; property: "opacity"; value: 1.0 } PauseAnimation { duration: 2450 } NumberAnimation { targets: [contentItem, background]; property: "opacity"; to: 0.0 } } diff --git a/src/imports/controls/universal/ScrollBar.qml b/src/imports/controls/universal/ScrollBar.qml index 981e382a..cbb81f1b 100644 --- a/src/imports/controls/universal/ScrollBar.qml +++ b/src/imports/controls/universal/ScrollBar.qml @@ -83,6 +83,7 @@ T.ScrollBar { Transition { from: "active" SequentialAnimation { + PropertyAction{ targets: [contentItem, background]; property: "opacity"; value: 1.0 } PauseAnimation { duration: 3000 } NumberAnimation { targets: [contentItem, background]; property: "opacity"; to: 0.0 } } diff --git a/tests/auto/controls/data/tst_scrollbar.qml b/tests/auto/controls/data/tst_scrollbar.qml index 6697de88..3e153ebb 100644 --- a/tests/auto/controls/data/tst_scrollbar.qml +++ b/tests/auto/controls/data/tst_scrollbar.qml @@ -736,4 +736,44 @@ TestCase { container.destroy() } + + function test_flashing() { + var control = createTemporaryObject(scrollBar, testCase, {size: 0.2}) + verify(control) + + var activeSpy = signalSpy.createObject(control, {target: control, signalName: "activeChanged"}) + verify(activeSpy.valid) + + compare(control.active, false) + if (control.contentItem) + compare(control.contentItem.opacity, 0) + if (control.background) + compare(control.background.opacity, 0) + + control.increase() + compare(control.position, 0.1) + compare(control.active, false) + compare(activeSpy.count, 2) + if (control.contentItem) + verify(control.contentItem.opacity > 0) + if (control.background) + verify(control.background.opacity > 0) + if (control.contentItem) + tryCompare(control.contentItem, "opacity", 0) + if (control.background) + tryCompare(control.background, "opacity", 0) + + control.decrease() + compare(control.position, 0.0) + compare(control.active, false) + compare(activeSpy.count, 4) + if (control.contentItem) + verify(control.contentItem.opacity > 0) + if (control.background) + verify(control.background.opacity > 0) + if (control.contentItem) + tryCompare(control.contentItem, "opacity", 0) + if (control.background) + tryCompare(control.background, "opacity", 0) + } } |