diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-04 17:29:24 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-06 13:16:02 +0000 |
| commit | 9c2e165ac25e2c0601a64aeb65c0254c34b624e8 (patch) | |
| tree | 242937417a6c5958df68f504b9f2b8174ab0bebd /src/imports/controls/universal/Button.qml | |
| parent | 19b967506deea84a0d56375e5bcca48168a3cfc8 (diff) | |
Button: migrate from label to contentItem
Change-Id: Icccab45dec0dafc907847eb0151b60bd9320ab9a
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/universal/Button.qml')
| -rw-r--r-- | src/imports/controls/universal/Button.qml | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/imports/controls/universal/Button.qml b/src/imports/controls/universal/Button.qml index c43d8d67..18b242ca 100644 --- a/src/imports/controls/universal/Button.qml +++ b/src/imports/controls/universal/Button.qml @@ -42,10 +42,10 @@ T.Button { 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 topPadding: 4 leftPadding: 8 @@ -54,13 +54,8 @@ T.Button { property bool useSystemFocusVisuals: true - //! [label] - label: Text { - x: control.leftPadding - y: control.topPadding - width: control.availableWidth - height: control.availableHeight - + //! [contentItem] + contentItem: Text { text: control.text font: control.font elide: Text.ElideRight @@ -70,7 +65,7 @@ T.Button { color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseHighColor } - //! [label] + //! [contentItem] //! [background] background: Rectangle { |