From 2ba8261fee95cca0d119879a95f871133f0b51d5 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sat, 27 Jun 2015 00:57:26 +0200 Subject: Control::spacing Change-Id: I67d81db16e95813b1ed9903017ce4d272093f7bb Reviewed-by: J-P Nurmi --- src/imports/controls/ToggleButton.qml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/imports/controls/ToggleButton.qml') diff --git a/src/imports/controls/ToggleButton.qml b/src/imports/controls/ToggleButton.qml index 1655a317..2ecc0f18 100644 --- a/src/imports/controls/ToggleButton.qml +++ b/src/imports/controls/ToggleButton.qml @@ -43,7 +43,7 @@ AbstractToggleButton { implicitWidth: Math.max(background ? background.implicitWidth : 0, (label ? label.implicitWidth : 0) + (indicator ? indicator.implicitWidth : 0) + - (label && indicator ? Theme.spacing : 0) + leftPadding + rightPadding) + (label && indicator ? spacing : 0) + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, Math.max(label ? label.implicitHeight : 0, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) @@ -55,6 +55,7 @@ AbstractToggleButton { Accessible.role: Accessible.Button padding: Theme.padding + spacing: Theme.spacing //! [indicator] indicator: Rectangle { @@ -93,9 +94,9 @@ AbstractToggleButton { //! [label] label: Text { - x: control.mirrored ? control.leftPadding : (indicator.x + indicator.width + control.Theme.spacing) + x: control.mirrored ? control.leftPadding : (indicator.x + indicator.width + control.spacing) y: control.topPadding - width: control.availableWidth - indicator.width - control.Theme.spacing + width: control.availableWidth - indicator.width - control.spacing height: control.availableHeight text: control.text -- cgit v1.2.3