aboutsummaryrefslogtreecommitdiffstats
path: root/src/quickcontrols/material/impl/qquickmaterialtextcontainer.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Update commercial SPDX-License-Identifier"Tarja Sundqvist2025-01-031-1/+1
| | | | | | | | | | This reverts commit da5933f22c00270ac9083a089686e5c54e0057da. Revert of commercial SPDX license identifiers is required for the Qt 6.5.x opensource releases, Qt 6.5.4 onwards. Change-Id: Ic056fb761f242af0ec4c883ecb35d50804c1c67c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Material: respect horizontalAlignment in placeholder textHatem ElKharashy2023-11-151-14/+33
| | | | | | | | | | | | | | | This allows placeholder text to follow the Alignment set to the TextField or TextArea components when using Material style. The placeholder text will float to the left, right, or center depending on the alignment set, and the arc will be drawn properly in case of Material.Outline container style. Fixes: QTBUG-118856 Change-Id: Ic9cede806dc2f6109e7e2c4b2b2fc960d9c6a1b6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 7e678acbb6167218d349c49436499121b2025af5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit c8a95333eb532ad1611f6e2f1a74d96b156cfb16)
* Update commercial SPDX-License-IdentifierTarja Sundqvist2023-10-231-1/+1
| | | | | | | | | | Updated the commercial SPDX-License-Identifier to the files in tqtc-qtdeclarative. Examples, tests, or documentation files were not updated. Task-number: QTQAINFRA-5900 Change-Id: I74e2ac15b270b503edc80369b126913dd2ec33e1 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Material: fix TextArea decorations when in a FlickableMitch Curtis2023-04-191-3/+21
| | | | | | | | | | | | | | | | | This patch fixes the following issues when the Material TextArea is attached to a Flickable: - Floating placeholder text scrolls with the Flickable. - When text is cleared without the control having focus: - Floating placeholder text is positioned incorrectly. - The floating text background outline gap is still open. - The background outline color is incorrect when the control has focus (used primaryTextColor instead of accentColor). Task-number: QTBUG-112650 Change-Id: Icfa3517e4abcb1209ea2291dabdec225011f19ef Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 2d99c70f982da92c70c022551cf456877141a5c8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update Material TextField to Material 3Mitch Curtis2023-02-161-0/+385
Fixes: QTBUG-72554 Fixes: QTBUG-109218 Change-Id: I0bc6fc3d16630352dcd5c58c5dd2b1bf794741c5 Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> (cherry picked from commit 20e3d1b522d1b79239e9ac4a6af47ce3648512bd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>