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/universal | |
| 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/universal')
| -rw-r--r-- | src/imports/controls/universal/ScrollBar.qml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/imports/controls/universal/ScrollBar.qml b/src/imports/controls/universal/ScrollBar.qml index d627eab6..981e382a 100644 --- a/src/imports/controls/universal/ScrollBar.qml +++ b/src/imports/controls/universal/ScrollBar.qml @@ -46,6 +46,8 @@ T.ScrollBar { implicitHeight: Math.max(background ? background.implicitHeight : 0, contentItem.implicitHeight + topPadding + bottomPadding) + visible: control.policy !== T.ScrollBar.AlwaysOff + // TODO: arrows contentItem: Rectangle { @@ -54,7 +56,6 @@ T.ScrollBar { color: control.pressed ? control.Universal.baseMediumColor : control.interactive && control.hovered ? control.Universal.baseMediumLowColor : control.Universal.chromeHighColor - visible: control.size < 1.0 opacity: 0.0 } @@ -70,7 +71,7 @@ T.ScrollBar { states: [ State { name: "active" - when: control.active + when: control.policy === T.ScrollBar.AlwaysOn || (control.active && control.size < 1.0) } ] |