From b69bccacffa24194233e6c08cc0d2ee3626552e1 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Thu, 5 Jun 2014 19:22:35 +0200 Subject: Make Base ToolButtonStyle honor icon size. Change-Id: Iba7cd88bd3d69ad254f312f57845d10c6170af63 Reviewed-by: Gabriel de Dietrich --- src/controls/Styles/Base/ToolButtonStyle.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/controls/Styles/Base/ToolButtonStyle.qml') diff --git a/src/controls/Styles/Base/ToolButtonStyle.qml b/src/controls/Styles/Base/ToolButtonStyle.qml index fc4dc6062..1f47675fa 100644 --- a/src/controls/Styles/Base/ToolButtonStyle.qml +++ b/src/controls/Styles/Base/ToolButtonStyle.qml @@ -51,9 +51,9 @@ Style { readonly property ToolButton control: __control property Component panel: Item { id: styleitem - implicitWidth: (hasIcon ? 36 : Math.max(label.implicitWidth + frame.border.left + frame.border.right, 36)) + implicitWidth: (hasIcon ? icon.width : Math.max(label.implicitWidth + frame.border.left + frame.border.right, 36)) + (arrow.visible ? 10 : 0) - implicitHeight: hasIcon ? 36 : Math.max(label.implicitHeight, 36) + implicitHeight: hasIcon ? icon.height : Math.max(label.implicitHeight, 36) readonly property bool hasIcon: icon.status === Image.Ready || icon.status === Image.Loading -- cgit v1.2.3