aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSami Varanka <[email protected]>2024-04-11 10:20:36 +0300
committerQt Cherry-pick Bot <[email protected]>2024-04-17 16:23:09 +0000
commit8b2a4913c3c7a6e5c84e4cff567ccfde1c5922a0 (patch)
tree36b6bdcb7f2c39d189ba1115574b544b602d65e1
parenta82f5419bf9868450be8800b58bd09580203fd1e (diff)
Fix top padding in Material style textarea
Material and Universal style MessageDialog didn't set implicit width and height for the TextArea's background. This caused problems especially with material style's messagedialog where the detailed text went over the TextArea's background's bounds. Pick-to: 6.6 Fixes: QTBUG-123763 Change-Id: Ib318f4a514a1b0941b4d50d960b383aca27e5d9f Reviewed-by: Mitch Curtis <[email protected]> (cherry picked from commit c283d4473edd1532cf1bce91ad1215e42e4fa15b) Reviewed-by: Qt Cherry-pick Bot <[email protected]>
-rw-r--r--src/quickdialogs/quickdialogsquickimpl/qml/+Material/MessageDialog.qml2
-rw-r--r--src/quickdialogs/quickdialogsquickimpl/qml/+Universal/MessageDialog.qml2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/quickdialogs/quickdialogsquickimpl/qml/+Material/MessageDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Material/MessageDialog.qml
index a678503d6c..e336185430 100644
--- a/src/quickdialogs/quickdialogsquickimpl/qml/+Material/MessageDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Material/MessageDialog.qml
@@ -117,6 +117,8 @@ MessageDialogImpl {
Layout.bottomMargin: 20
background: Rectangle {
+ implicitWidth: 120
+ implicitHeight: control.Material.textFieldHeight
color: Qt.rgba(1,1,1,1)
radius: 3
border.color: Qt.darker(control.palette.light)
diff --git a/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/MessageDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/MessageDialog.qml
index ac63d281d1..37284503d2 100644
--- a/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/MessageDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/MessageDialog.qml
@@ -115,6 +115,8 @@ MessageDialogImpl {
Layout.bottomMargin: 20
background: Rectangle {
+ implicitWidth: 60 // TextControlThemeMinWidth - 4 (border)
+ implicitHeight: 28 // TextControlThemeMinHeight - 4 (border)
color: Qt.rgba(1,1,1,1)
radius: 3
border.color: Qt.darker(control.palette.light)