diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-04 13:22:07 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-04 20:15:58 +0000 |
| commit | 469012e1e4c2a7f667fcf822ea64adea66804287 (patch) | |
| tree | bc046b084bc751ba22e54cbb15c4d56bdf695307 /src/imports | |
| parent | 82f7d6bcefe233def40311d16fffe68c6f72282f (diff) | |
ItemDelegate: specify baseline offset
Change-Id: I5bbcd762f2a70822262490835bf46caaa95f4c07
Task-number: QTBUG-49468
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/controls/ItemDelegate.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/material/ItemDelegate.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/universal/ItemDelegate.qml | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/imports/controls/ItemDelegate.qml b/src/imports/controls/ItemDelegate.qml index f8060432..b5dfb4b6 100644 --- a/src/imports/controls/ItemDelegate.qml +++ b/src/imports/controls/ItemDelegate.qml @@ -47,6 +47,7 @@ T.ItemDelegate { implicitHeight: Math.max(background ? background.implicitHeight : 0, Math.max(label ? label.implicitHeight : 0, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: label ? label.y + label.baselineOffset : 0 padding: 12 spacing: 12 diff --git a/src/imports/controls/material/ItemDelegate.qml b/src/imports/controls/material/ItemDelegate.qml index e6b15467..8cd53e88 100644 --- a/src/imports/controls/material/ItemDelegate.qml +++ b/src/imports/controls/material/ItemDelegate.qml @@ -48,6 +48,7 @@ T.ItemDelegate { implicitHeight: Math.max(background ? background.implicitHeight : 0, Math.max(label ? label.implicitHeight : 0, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: label ? label.y + label.baselineOffset : 0 padding: 16 spacing: 16 diff --git a/src/imports/controls/universal/ItemDelegate.qml b/src/imports/controls/universal/ItemDelegate.qml index 2def5f79..d2c9a4f3 100644 --- a/src/imports/controls/universal/ItemDelegate.qml +++ b/src/imports/controls/universal/ItemDelegate.qml @@ -48,6 +48,7 @@ T.ItemDelegate { implicitHeight: Math.max(background ? background.implicitHeight : 0, Math.max(label ? label.implicitHeight : 0, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: label ? label.y + label.baselineOffset : 0 spacing: 12 |