diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-01-19 20:47:01 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-01-20 15:26:27 +0000 |
| commit | 6c0ee76c646778d6a45018acc8d561c5a5d931f8 (patch) | |
| tree | 4dce1aa95b24b88c810c8277f4eddd8d17a12f3f /src/imports/controls/material | |
| parent | fa388f4a5986ae243d9d50ea26b320cb76619377 (diff) | |
Add ScrollBar::policy
[ChangeLog][Controls][ScrollBar] Added a policy-property, which holds
whether the scroll bar is shown always/never/as needed (default).
Change-Id: Ibe25edaef04a7926bc12c59913efa7a3d43a5ccf
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/material')
| -rw-r--r-- | src/imports/controls/material/ScrollBar.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/material/ScrollBar.qml b/src/imports/controls/material/ScrollBar.qml index 5993ab58..156c5781 100644 --- a/src/imports/controls/material/ScrollBar.qml +++ b/src/imports/controls/material/ScrollBar.qml @@ -47,6 +47,7 @@ T.ScrollBar { contentItem.implicitHeight + topPadding + bottomPadding) padding: control.interactive ? 1 : 2 + visible: control.policy !== T.ScrollBar.AlwaysOff contentItem: Rectangle { id: handle @@ -56,7 +57,6 @@ T.ScrollBar { color: control.pressed ? control.Material.scrollBarPressedColor : control.interactive && control.hovered ? control.Material.scrollBarHoveredColor : control.Material.scrollBarColor - visible: control.size < 1.0 opacity: 0.0 } @@ -70,7 +70,7 @@ T.ScrollBar { states: State { name: "active" - when: control.active + when: control.policy === T.ScrollBar.AlwaysOn || (control.active && control.size < 1.0) } transitions: [ |