aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-12-16 18:37:05 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-12-17 07:09:41 +0000
commit0dc345a16de16e6712413b63d9001eaa9d83485c (patch)
treec09d824c5004f364fa225298dc0adff44fa4b6ff /src/imports
parent2600bd0eedeaff3dd7727a57ee6149f5211780b4 (diff)
Material: fix mis-aligned text in tabs
Same as 5f5654f but for the Material style. Change-Id: I5d206c396099af6dafbe828438cdf9262896502e Task-number: QTBUG-48718 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/controls/material/TabButton.qml4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/material/TabButton.qml b/src/imports/controls/material/TabButton.qml
index 67473744..22dcd7a0 100644
--- a/src/imports/controls/material/TabButton.qml
+++ b/src/imports/controls/material/TabButton.qml
@@ -42,9 +42,9 @@ T.TabButton {
id: control
implicitWidth: Math.max(background ? background.implicitWidth : 0,
- label ? label.implicitWidth + leftPadding + rightPadding : 0)
+ label ? label.contentWidth + leftPadding + rightPadding : 0)
implicitHeight: Math.max(background ? background.implicitHeight : 0,
- label ? label.implicitHeight + topPadding + bottomPadding : 0)
+ label ? label.contentHeight + topPadding + bottomPadding : 0)
baselineOffset: label ? label.y + label.baselineOffset : 0
padding: 6