diff options
| author | Mitch Curtis <[email protected]> | 2024-03-06 16:00:24 +0800 |
|---|---|---|
| committer | Mitch Curtis <[email protected]> | 2024-03-07 09:32:12 +0800 |
| commit | cb7eb152204e206539f307a9556eea43c589f026 (patch) | |
| tree | b51e55f2d63c5b6d49da81631f5d592009640970 /tests/manual/quickcontrols | |
| parent | 8726722886454be0fd531ce7f28ad3bdec12cab1 (diff) | |
Material: fix floating placeholder text x position
Don't set it to control.leftPadding, because we don't want it to change
if the user changes leftPadding.
Fixes: QTBUG-120149
Pick-to: 6.5 6.6 6.7
Change-Id: I67bbc22192fef386fe088398b67d3eb0a10421ba
Reviewed-by: Oliver Eftevaag <[email protected]>
Diffstat (limited to 'tests/manual/quickcontrols')
| -rw-r--r-- | tests/manual/quickcontrols/material/pages/TextAreaPage.qml | 32 | ||||
| -rw-r--r-- | tests/manual/quickcontrols/material/pages/TextFieldPage.qml | 32 |
2 files changed, 64 insertions, 0 deletions
diff --git a/tests/manual/quickcontrols/material/pages/TextAreaPage.qml b/tests/manual/quickcontrols/material/pages/TextAreaPage.qml index ef92ffd589..9de28d1118 100644 --- a/tests/manual/quickcontrols/material/pages/TextAreaPage.qml +++ b/tests/manual/quickcontrols/material/pages/TextAreaPage.qml @@ -91,6 +91,38 @@ Page { Material.containerStyle: layout.containerStyle } + TextArea { + text: "0 leftPadding" + placeholderText: "placeholderText" + leftPadding: 0 + + Material.containerStyle: layout.containerStyle + } + + TextArea { + text: "0 rightPadding" + placeholderText: "placeholderText" + rightPadding: 0 + + Material.containerStyle: layout.containerStyle + } + + TextArea { + text: "0 topPadding" + placeholderText: "placeholderText" + topPadding: 0 + + Material.containerStyle: layout.containerStyle + } + + TextArea { + text: "0 bottomPadding" + placeholderText: "placeholderText" + bottomPadding: 0 + + Material.containerStyle: layout.containerStyle + } + Flickable { width: 200 height: 100 diff --git a/tests/manual/quickcontrols/material/pages/TextFieldPage.qml b/tests/manual/quickcontrols/material/pages/TextFieldPage.qml index 63c89f0f9c..9aeef4b5c2 100644 --- a/tests/manual/quickcontrols/material/pages/TextFieldPage.qml +++ b/tests/manual/quickcontrols/material/pages/TextFieldPage.qml @@ -59,6 +59,38 @@ Page { Material.containerStyle: layout.containerStyle } + + TextField { + text: "0 leftPadding" + placeholderText: "placeholderText" + leftPadding: 0 + + Material.containerStyle: layout.containerStyle + } + + TextField { + text: "0 rightPadding" + placeholderText: "placeholderText" + rightPadding: 0 + + Material.containerStyle: layout.containerStyle + } + + TextField { + text: "0 topPadding" + placeholderText: "placeholderText" + topPadding: 0 + + Material.containerStyle: layout.containerStyle + } + + TextField { + text: "0 bottomPadding" + placeholderText: "placeholderText" + bottomPadding: 0 + + Material.containerStyle: layout.containerStyle + } } ColumnLayout { |