diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-04 13:26:33 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-04 20:16:01 +0000 |
| commit | ad2f8bbf49739be5cba598181771cf50c972886c (patch) | |
| tree | bf4804ab922a341e7b7b1c9936214cf0c6ef2096 | |
| parent | 469012e1e4c2a7f667fcf822ea64adea66804287 (diff) | |
SpinBox: specify baseline offset
Change-Id: I81c8ea1dd8086cb2913998c5c91339b9b0ad0247
Task-number: QTBUG-49468
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| -rw-r--r-- | src/imports/controls/SpinBox.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/material/SpinBox.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/universal/SpinBox.qml | 1 | ||||
| -rw-r--r-- | tests/auto/controls/data/tst_spinbox.qml | 7 |
4 files changed, 10 insertions, 0 deletions
diff --git a/src/imports/controls/SpinBox.qml b/src/imports/controls/SpinBox.qml index 3933f5ab..4b42a839 100644 --- a/src/imports/controls/SpinBox.qml +++ b/src/imports/controls/SpinBox.qml @@ -48,6 +48,7 @@ T.SpinBox { background ? background.implicitHeight : 0, up.indicator ? up.indicator.implicitHeight : 0, down.indicator ? down.indicator.implicitHeight : 0) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 6 leftPadding: 6 + (control.mirrored ? (up.indicator ? up.indicator.width : 0) : (down.indicator ? down.indicator.width : 0)) diff --git a/src/imports/controls/material/SpinBox.qml b/src/imports/controls/material/SpinBox.qml index 3020efae..be51d06c 100644 --- a/src/imports/controls/material/SpinBox.qml +++ b/src/imports/controls/material/SpinBox.qml @@ -50,6 +50,7 @@ T.SpinBox { background ? background.implicitHeight : 0, up.indicator ? up.indicator.implicitHeight : 0, down.indicator ? down.indicator.implicitHeight : 0) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 6 leftPadding: 6 + (control.mirrored ? (up.indicator ? up.indicator.width : 0) : (down.indicator ? down.indicator.width : 0)) diff --git a/src/imports/controls/universal/SpinBox.qml b/src/imports/controls/universal/SpinBox.qml index a081cc23..ac027d75 100644 --- a/src/imports/controls/universal/SpinBox.qml +++ b/src/imports/controls/universal/SpinBox.qml @@ -49,6 +49,7 @@ T.SpinBox { background ? background.implicitHeight : 0, up.indicator ? up.indicator.implicitHeight : 0, down.indicator ? down.indicator.implicitHeight : 0) + baselineOffset: contentItem.y + contentItem.baselineOffset // TextControlThemePadding + 2 (border) topPadding: 5 diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml index b5d85dbd..a2ab5a4a 100644 --- a/tests/auto/controls/data/tst_spinbox.qml +++ b/tests/auto/controls/data/tst_spinbox.qml @@ -298,4 +298,11 @@ TestCase { control.destroy() } + + function test_baseline() { + var control = spinBox.createObject(testCase) + verify(control) + compare(control.baselineOffset, control.contentItem.y + control.contentItem.baselineOffset) + control.destroy() + } } |