aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-12-20 11:06:31 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-12-20 10:52:56 +0000
commit030c8395ae5c5c446b144bbf6d79cda69e3a581d (patch)
tree3043effd23705bc9c4b6d8debd039c548fbb49ef /src
parent880381d92c12f32c8d8f7680454bd68d36187258 (diff)
Material: increase ToolBar size
Android has 46dp in portrait, 40dp in landscape. We had 26, which felt very small. Increase to 40 and see if it feels better. Change-Id: Iaf3152e3688e3288712f78247a1396c83ae42f89 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/imports/controls/material/ToolBar.qml2
-rw-r--r--src/imports/controls/material/ToolButton.qml4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/controls/material/ToolBar.qml b/src/imports/controls/material/ToolBar.qml
index 59a0e599..2565f0b1 100644
--- a/src/imports/controls/material/ToolBar.qml
+++ b/src/imports/controls/material/ToolBar.qml
@@ -41,7 +41,7 @@ T.ToolBar {
id: control
implicitWidth: contentWidth + leftPadding + rightPadding
- implicitHeight: Math.max(26, contentHeight + topPadding + bottomPadding)
+ implicitHeight: Math.max(40, contentHeight + topPadding + bottomPadding)
contentWidth: contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0
contentHeight: contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0
diff --git a/src/imports/controls/material/ToolButton.qml b/src/imports/controls/material/ToolButton.qml
index ce755d2b..e097f8e0 100644
--- a/src/imports/controls/material/ToolButton.qml
+++ b/src/imports/controls/material/ToolButton.qml
@@ -67,8 +67,8 @@ T.ToolButton {
//! [background]
background: Rectangle {
- implicitWidth: 26
- implicitHeight: 26
+ implicitWidth: 40
+ implicitHeight: 40
color: control.pressed ? control.Material.flatButtonPressColor : control.Material.flatButtonFocusColor
visible: control.enabled && (control.pressed || control.activeFocus || control.checked || control.highlighted)