diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-03-02 18:42:28 +0100 |
|---|---|---|
| committer | Jari-Pekka Nurmi <jpnurmi@theqtcompany.com> | 2015-03-03 02:02:13 +0200 |
| commit | aceaa093f90fd006e5b2d9523b8ed6cab7b8577d (patch) | |
| tree | 40176808133244acfcf09e861ee6c7e997ca8ab0 /src/imports/controls/ScrollIndicator.qml | |
| parent | f965016e5d001e7a844893a46902fb5b0ef84262 (diff) | |
Update src/imports to use top/left/right/bottomPadding
Change-Id: I9c72db2d8f44429a7c87baaad663b88c7e1f1bb9
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/ScrollIndicator.qml')
| -rw-r--r-- | src/imports/controls/ScrollIndicator.qml | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/imports/controls/ScrollIndicator.qml b/src/imports/controls/ScrollIndicator.qml index 7a4bbba6..0b361e87 100644 --- a/src/imports/controls/ScrollIndicator.qml +++ b/src/imports/controls/ScrollIndicator.qml @@ -41,13 +41,16 @@ AbstractScrollIndicator { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - indicator.implicitWidth + padding.left + padding.right) + indicator.implicitWidth + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, - indicator.implicitHeight + padding.top + padding.bottom) + indicator.implicitHeight + topPadding + bottomPadding) Accessible.role: Accessible.Indicator - padding { top: 2; left: 2; right: 2; bottom: 2 } + topPadding: 2 + leftPadding: 2 + rightPadding: 2 + bottomPadding: 2 indicator: Rectangle { id: indicator @@ -60,10 +63,10 @@ AbstractScrollIndicator { opacity: 0.0 readonly property bool horizontal: control.orientation === Qt.Horizontal - x: padding.left + (horizontal ? control.position * control.width : 0) - y: padding.top + (horizontal ? 0 : control.position * control.height) - width: horizontal ? control.size * control.width - padding.left - padding.right : implicitWidth - height: horizontal ? implicitHeight : control.size * control.height - padding.top - padding.bottom + x: control.leftPadding + (horizontal ? control.position * control.width : 0) + y: control.topPadding + (horizontal ? 0 : control.position * control.height) + width: horizontal ? control.size * control.width - control.leftPadding - control.rightPadding : implicitWidth + height: horizontal ? implicitHeight : control.size * control.height - control.topPadding - control.bottomPadding states: State { name: "active" |