aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAli Kianian <ali.kianian@qt.io>2024-01-23 11:28:17 +0200
committerAli Kianian <ali.kianian@qt.io>2024-01-23 09:47:14 +0000
commit72162e8ee76a0e4af0a7bf95b6c6b7efa91b134e (patch)
tree7bc5e364b7a1c3c556b58e0708e7be0ad4b76b37
parent362e6f7b73731ef123bc521cf7faa487219914e3 (diff)
QmlDesigner: Set minimum size for collection editor cells
Fixes: QDS-11463 Change-Id: I33a4d33adc75e0132a20a78bc3519ff4a191e907 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
-rw-r--r--share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml18
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml2
2 files changed, 20 insertions, 0 deletions
diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml
index 2bfd33b54c..5495164881 100644
--- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml
+++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml
@@ -194,6 +194,24 @@ Rectangle {
Layout.minimumHeight: 20
Layout.maximumWidth: root.width
+ columnWidthProvider: function(column) {
+ if (!isColumnLoaded(column))
+ return -1
+ let w = explicitColumnWidth(column)
+ if (w < 0)
+ w = implicitColumnWidth(column)
+ return Math.max(w, StudioTheme.Values.collectionCellMinimumWidth)
+ }
+
+ rowHeightProvider: function(row) {
+ if (!isRowLoaded(row))
+ return -1
+ let h = explicitRowHeight(row)
+ if (h < 0)
+ h = implicitRowHeight(row)
+ return Math.max(h, StudioTheme.Values.collectionCellMinimumHeight)
+ }
+
delegate: Rectangle {
id: itemCell
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
index 3d0ed81ab2..fadebdd720 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
@@ -248,6 +248,8 @@ QtObject {
property real collectionItemTextPadding: 5
property real collectionTableHorizontalMargin: 10
property real collectionTableVerticalMargin: 10
+ property real collectionCellMinimumWidth: 60
+ property real collectionCellMinimumHeight: 20
// NEW NEW NEW
readonly property int flowMargin: 7