diff options
-rw-r--r-- | src/imports/controls/TabButton.qml | 17 | ||||
-rw-r--r-- | src/imports/controls/material/TabButton.qml | 17 | ||||
-rw-r--r-- | src/imports/controls/universal/TabButton.qml | 17 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_tabbutton.qml | 2 |
4 files changed, 19 insertions, 34 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 { diff --git a/src/imports/controls/material/TabButton.qml b/src/imports/controls/material/TabButton.qml index 22dcd7a0..5b7510b4 100644 --- a/src/imports/controls/material/TabButton.qml +++ b/src/imports/controls/material/TabButton.qml @@ -42,20 +42,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: Item { diff --git a/src/imports/controls/universal/TabButton.qml b/src/imports/controls/universal/TabButton.qml index 3b9fc60c..b332160b 100644 --- a/src/imports/controls/universal/TabButton.qml +++ b/src/imports/controls/universal/TabButton.qml @@ -42,20 +42,15 @@ T.TabButton { 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: 12 // PivotItemMargin - //! [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 @@ -64,5 +59,5 @@ T.TabButton { verticalAlignment: Text.AlignVCenter renderType: Text.NativeRendering } - //! [label] + //! [contentItem] } diff --git a/tests/auto/controls/data/tst_tabbutton.qml b/tests/auto/controls/data/tst_tabbutton.qml index 3a817cfd..f755c081 100644 --- a/tests/auto/controls/data/tst_tabbutton.qml +++ b/tests/auto/controls/data/tst_tabbutton.qml @@ -85,7 +85,7 @@ TestCase { function test_baseline() { var control = tabButton.createObject(testCase) verify(control) - compare(control.baselineOffset, control.label.y + control.label.baselineOffset) + compare(control.baselineOffset, control.contentItem.y + control.contentItem.baselineOffset) control.destroy() } } |