diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-04-25 14:03:11 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-04-25 14:08:00 +0000 |
| commit | a55ec55a13e4105fd3facdada1c2899190c52828 (patch) | |
| tree | 1a75d3ac878d4fd71e074c3074ce7ae33aa5516d /src/imports/controls/material/Button.qml | |
| parent | c45021e68a9aa4d1bb5286a65a9f3d5a719c7c65 (diff) | |
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 <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/material/Button.qml')
| -rw-r--r-- | src/imports/controls/material/Button.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml index 177e27b3..eed72906 100644 --- a/src/imports/controls/material/Button.qml +++ b/src/imports/controls/material/Button.qml @@ -80,7 +80,7 @@ T.Button { // TODO: Add a proper ripple/ink effect for mouse/touch input and focus state background: Rectangle { implicitWidth: 64 - implicitHeight: control.Material.buttonHeight + implicitHeight: control.Material.touchTarget // external vertical padding is 6 (to increase touch area) y: 6 |