From 58d9657594ca0fd1f5021a1fd89fe866dd52cee5 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Thu, 18 Oct 2012 16:50:59 +0200 Subject: [PATCH] binding loop-- --- declarativeimports/plasmacomponents/qml/Button.qml | 2 +- declarativeimports/plasmacomponents/qml/ToolButton.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/declarativeimports/plasmacomponents/qml/Button.qml b/declarativeimports/plasmacomponents/qml/Button.qml index 1e6c70291..3b8548e8a 100644 --- a/declarativeimports/plasmacomponents/qml/Button.qml +++ b/declarativeimports/plasmacomponents/qml/Button.qml @@ -98,7 +98,7 @@ Item { //icon + label + left margin + right margin + spacing between icon and text property real minimumWidth: icon.width + label.preferredWidth + surfaceNormal.margins.left + surfaceNormal.margins.right + ((icon.valid) ? surfaceNormal.margins.left : 0) - property real minimumHeight: Math.max(icon.height, label.paintedHeight) + surfaceNormal.margins.top + surfaceNormal.margins.bottom + property real minimumHeight: Math.max(theme.smallIconSize, label.paintedHeight) + surfaceNormal.margins.top + surfaceNormal.margins.bottom signal clicked() diff --git a/declarativeimports/plasmacomponents/qml/ToolButton.qml b/declarativeimports/plasmacomponents/qml/ToolButton.qml index 29ebbbed9..79e3fb54c 100644 --- a/declarativeimports/plasmacomponents/qml/ToolButton.qml +++ b/declarativeimports/plasmacomponents/qml/ToolButton.qml @@ -93,7 +93,7 @@ Item { //icon + label + left margin + right margin + spacing between icon and text property real minimumWidth: icon.width + label.preferredWidth + delegate.margins.left + delegate.margins.right + ((icon.valid) ? delegate.margins.left : 0) - property real minimumHeight: Math.max(icon.height, label.paintedHeight) + delegate.margins.top + delegate.margins.bottom + property real minimumHeight: Math.max(theme.smallIconSize, label.paintedHeight) + delegate.margins.top + delegate.margins.bottom implicitWidth: { if (label.text.length == 0) {