From a55ec55a13e4105fd3facdada1c2899190c52828 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 25 Apr 2018 14:03:11 +0200 Subject: Replace Material.buttonHeight with Material.touchTarget The visual height of a Material design Button is 36px in the normal variant, and 32px in the dense variant. The Button has 6px vertical insets to gain 48px touch target height. Rename the old buttonHeight property as touchTarget to make room for the visual buttonHeight that is needed when porting Button to use the newly introduced background insets. Change-Id: Ic2932f71ca75a626ff5e9b0ce9930e1b3f24cf00 Reviewed-by: Mitch Curtis --- src/imports/controls/material/SpinBox.qml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/imports/controls/material/SpinBox.qml') diff --git a/src/imports/controls/material/SpinBox.qml b/src/imports/controls/material/SpinBox.qml index acfef487..d0a09a10 100644 --- a/src/imports/controls/material/SpinBox.qml +++ b/src/imports/controls/material/SpinBox.qml @@ -82,8 +82,8 @@ T.SpinBox { up.indicator: Item { x: control.mirrored ? 0 : parent.width - width - implicitWidth: control.Material.buttonHeight - implicitHeight: control.Material.buttonHeight + implicitWidth: control.Material.touchTarget + implicitHeight: control.Material.touchTarget height: parent.height width: height @@ -116,8 +116,8 @@ T.SpinBox { down.indicator: Item { x: control.mirrored ? parent.width - width : 0 - implicitWidth: control.Material.buttonHeight - implicitHeight: control.Material.buttonHeight + implicitWidth: control.Material.touchTarget + implicitHeight: control.Material.touchTarget height: parent.height width: height @@ -143,7 +143,7 @@ T.SpinBox { background: Item { implicitWidth: 192 - implicitHeight: control.Material.buttonHeight + implicitHeight: control.Material.touchTarget Rectangle { x: parent.width / 2 - width / 2 -- cgit v1.2.3