diff options
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/controls/ScrollBar.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/material/ScrollBar.qml | 13 | ||||
| -rw-r--r-- | src/imports/controls/universal/ScrollBar.qml | 10 |
3 files changed, 14 insertions, 13 deletions
diff --git a/src/imports/controls/ScrollBar.qml b/src/imports/controls/ScrollBar.qml index 07ded9b5..366be48e 100644 --- a/src/imports/controls/ScrollBar.qml +++ b/src/imports/controls/ScrollBar.qml @@ -52,8 +52,8 @@ T.ScrollBar { contentItem: Rectangle { id: handle - implicitWidth: 6 - implicitHeight: 6 + implicitWidth: control.interactive ? 6 : 2 + implicitHeight: control.interactive ? 6 : 2 radius: width / 2 color: control.pressed ? Default.scrollBarPressedColor : Default.scrollBarColor diff --git a/src/imports/controls/material/ScrollBar.qml b/src/imports/controls/material/ScrollBar.qml index 140cb94d..5993ab58 100644 --- a/src/imports/controls/material/ScrollBar.qml +++ b/src/imports/controls/material/ScrollBar.qml @@ -46,25 +46,26 @@ T.ScrollBar { implicitHeight: Math.max(background ? background.implicitHeight : 0, contentItem.implicitHeight + topPadding + bottomPadding) - padding: 1 + padding: control.interactive ? 1 : 2 contentItem: Rectangle { id: handle - implicitWidth: 13 - implicitHeight: 13 + implicitWidth: control.interactive ? 13 : 4 + implicitHeight: control.interactive ? 13 : 4 color: control.pressed ? control.Material.scrollBarPressedColor : - control.hovered ? control.Material.scrollBarHoveredColor : control.Material.scrollBarColor + control.interactive && control.hovered ? control.Material.scrollBarHoveredColor : control.Material.scrollBarColor visible: control.size < 1.0 opacity: 0.0 } background: Rectangle { - implicitWidth: 16 - implicitHeight: 16 + implicitWidth: control.interactive ? 16 : 4 + implicitHeight: control.interactive ? 16 : 4 color: "#0e000000" opacity: 0.0 + visible: control.interactive } states: State { diff --git a/src/imports/controls/universal/ScrollBar.qml b/src/imports/controls/universal/ScrollBar.qml index 434d8fb2..d627eab6 100644 --- a/src/imports/controls/universal/ScrollBar.qml +++ b/src/imports/controls/universal/ScrollBar.qml @@ -49,18 +49,18 @@ T.ScrollBar { // TODO: arrows contentItem: Rectangle { - implicitWidth: 12 - implicitHeight: 12 + implicitWidth: control.interactive ? 12 : 6 + implicitHeight: control.interactive ? 12: 6 color: control.pressed ? control.Universal.baseMediumColor : - control.hovered ? control.Universal.baseMediumLowColor : control.Universal.chromeHighColor + control.interactive && control.hovered ? control.Universal.baseMediumLowColor : control.Universal.chromeHighColor visible: control.size < 1.0 opacity: 0.0 } background: Rectangle { - implicitWidth: 12 - implicitHeight: 12 + implicitWidth: control.interactive ? 12 : 6 + implicitHeight: control.interactive ? 12: 6 color: control.Universal.chromeLowColor visible: control.size < 1.0 |