diff options
| author | Mitch Curtis <mitch.curtis@digia.com> | 2014-06-05 19:22:35 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-10 16:40:19 +0200 |
| commit | b69bccacffa24194233e6c08cc0d2ee3626552e1 (patch) | |
| tree | 3168b6b1b70f2701a0530af1c5b502f321507f38 | |
| parent | 1d87aeefac8ea8a4572fa186a82477bd84d67a3f (diff) | |
| download | qtquickcontrols-b69bccacffa24194233e6c08cc0d2ee3626552e1.tar.gz | |
Make Base ToolButtonStyle honor icon size.
Change-Id: Iba7cd88bd3d69ad254f312f57845d10c6170af63
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| -rw-r--r-- | src/controls/Styles/Base/ToolButtonStyle.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/Styles/Base/ToolButtonStyle.qml b/src/controls/Styles/Base/ToolButtonStyle.qml index fc4dc606..1f47675f 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 |