diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-04 17:34:19 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-06 13:16:05 +0000 |
| commit | 80941f854f20f02f345fa36c5c2f3626ba0a95ee (patch) | |
| tree | 8802ff717074af3c2597abd63125ff938a5f8009 /src/imports/controls/universal/ToolButton.qml | |
| parent | 9c2e165ac25e2c0601a64aeb65c0254c34b624e8 (diff) | |
ToolButton: migrage from label to contentItem
Change-Id: Iacc8ba21e48f40062d0784c76d33dbf79ce803e0
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/universal/ToolButton.qml')
| -rw-r--r-- | src/imports/controls/universal/ToolButton.qml | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/imports/controls/universal/ToolButton.qml b/src/imports/controls/universal/ToolButton.qml index a7df8a84..5387db8c 100644 --- a/src/imports/controls/universal/ToolButton.qml +++ b/src/imports/controls/universal/ToolButton.qml @@ -42,20 +42,15 @@ T.ToolButton { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - label ? label.implicitWidth + leftPadding + rightPadding : 0) + contentItem.implicitWidth + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, - label ? label.implicitHeight + topPadding + bottomPadding : 0) - baselineOffset: label ? label.y + label.baselineOffset : 0 + contentItem.implicitHeight + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 6 - //! [label] - label: Text { - x: control.leftPadding - y: control.topPadding - width: control.availableWidth - height: control.availableHeight - + //! [contentItem] + contentItem: Text { text: control.text font: control.font color: control.enabled ? control.Universal.baseHighColor : control.Universal.baseLowColor @@ -64,7 +59,7 @@ T.ToolButton { verticalAlignment: Text.AlignVCenter renderType: Text.NativeRendering } - //! [label] + //! [contentItem] //! [background] background: Rectangle { |