diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-05 10:29:55 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-06 13:16:07 +0000 |
| commit | 51d8385e7eba662d63b73e2c9fa9b01ddc12cc51 (patch) | |
| tree | 7bb86364820537269442b37b86a1f48455c03ed3 /src/imports/controls/TabButton.qml | |
| parent | 80941f854f20f02f345fa36c5c2f3626ba0a95ee (diff) | |
TabButton: migrage from label to contentItem
Change-Id: I026bca7620235fbdd5e8b870c7e4f643ae0dcf49
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/TabButton.qml')
| -rw-r--r-- | src/imports/controls/TabButton.qml | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/imports/controls/TabButton.qml b/src/imports/controls/TabButton.qml index 178a0a7f..63a88b10 100644 --- a/src/imports/controls/TabButton.qml +++ b/src/imports/controls/TabButton.qml @@ -41,20 +41,15 @@ T.TabButton { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - label ? label.contentWidth + leftPadding + rightPadding : 0) + contentItem.contentWidth + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, - label ? label.contentHeight + topPadding + bottomPadding : 0) - baselineOffset: label ? label.y + label.baselineOffset : 0 + contentItem.contentHeight + 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 elide: Text.ElideRight @@ -63,7 +58,7 @@ T.TabButton { horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } - //! [label] + //! [contentItem] //! [background] background: Rectangle { |