QmlDesigner: Fix the size problems of the model editor

* The minimum size for the collection editor is modified.
* Layouts of the top toolbar are modified to show the buttons when
there is adequate space.
* A text display warning is fixed.

Fixes: QDS-11646
Fixes: QDS-11725
Change-Id: I7fe1aaf75abe13bb71f216cef13ea2b8f2cf9a9b
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>

4 files changed, 8 insertions, 10 deletions

diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsToolbar.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsToolbar.qml
index ff1ffd77aa..7318707b8c 100644
--- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsToolbar.qml
+++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsToolbar.qml
@@ -34,8 +34,6 @@ Rectangle {
         anchors.fill: parent
         anchors.topMargin: StudioTheme.Values.toolbarVerticalMargin
         anchors.bottomMargin: StudioTheme.Values.toolbarVerticalMargin
-        anchors.leftMargin: StudioTheme.Values.toolbarHorizontalMargin
-        anchors.rightMargin: StudioTheme.Values.toolbarHorizontalMargin
 
         spacing: StudioTheme.Values.sectionRowSpacing
 
@@ -43,6 +41,7 @@ Rectangle {
             id: leftSideToolbar
 
             Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
+            Layout.leftMargin: StudioTheme.Values.toolbarHorizontalMargin
             spacing: StudioTheme.Values.sectionRowSpacing
 
             IconButton {
@@ -93,15 +92,12 @@ Rectangle {
             }
         }
 
-        Item { // spacer
-            Layout.minimumHeight: 1
-            Layout.fillWidth: true
-        }
-
         RowLayout {
             id: rightSideToolbar
+
             spacing: StudioTheme.Values.sectionRowSpacing
             Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+            Layout.rightMargin: StudioTheme.Values.toolbarHorizontalMargin
 
             IconButton {
                 buttonIcon: StudioTheme.Constants.save_medium
diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml
index ed0e11a395..6f606c4aab 100644
--- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml
+++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml
@@ -46,7 +46,8 @@ Rectangle {
             rowSpacing: 1
             columnSpacing: 1
 
-            Layout.margins: StudioTheme.Values.collectionTableHorizontalMargin
+            Layout.leftMargin: StudioTheme.Values.collectionTableHorizontalMargin
+            Layout.topMargin: StudioTheme.Values.collectionTableVerticalMargin
 
             Layout.fillWidth: true
             Layout.fillHeight: true
@@ -238,7 +239,7 @@ Rectangle {
                             id: cellText
 
                             Text {
-                                text: display
+                                text: display ?? ""
                                 color: itemSelected ? StudioTheme.Values.themeInteraction
                                                     : StudioTheme.Values.themePlaceholderTextColorInteraction
                                 leftPadding: 5
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
index fea73e1ad2..3d0ed81ab2 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
@@ -247,6 +247,7 @@ QtObject {
     property real collectionItemTextMargin: 5
     property real collectionItemTextPadding: 5
     property real collectionTableHorizontalMargin: 10
+    property real collectionTableVerticalMargin: 10
 
     // NEW NEW NEW
     readonly property int flowMargin: 7
diff --git a/src/plugins/qmldesigner/components/collectioneditor/collectionwidget.cpp b/src/plugins/qmldesigner/components/collectioneditor/collectionwidget.cpp
index 39097cbeb3..a123cf3361 100644
--- a/src/plugins/qmldesigner/components/collectioneditor/collectionwidget.cpp
+++ b/src/plugins/qmldesigner/components/collectioneditor/collectionwidget.cpp
@@ -144,7 +144,7 @@ void CollectionWidget::reloadQmlSource()
 
 QSize CollectionWidget::minimumSizeHint() const
 {
-    return {300, 400};
+    return {300, 300};
 }
 
 bool CollectionWidget::loadJsonFile(const QUrl &url, const QString &collectionName)