From dbf2ae4f6042cc9511d81b1676f5d5a27062a32b Mon Sep 17 00:00:00 2001
From: Joey de l'Arago <joeydelarago@gmail.com>
Date: Wed, 30 Nov 2022 15:09:05 +0100
Subject: [PATCH] Fix spacing vertical between Recommended sections and setting
 items.

CURA-9793
---
 .../Recommended/RecommendedPrintSetup.qml     | 39 ++++++++++---------
 .../Recommended/RecommendedSettingSection.qml |  6 ++-
 .../RecommendedStrengthSelector.qml           |  1 -
 .../RecommendedSupportSelector.qml            |  2 -
 resources/themes/cura-light/theme.json        |  2 +
 5 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml
index 7e25785c74..d369d3ef2c 100644
--- a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml
+++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml
@@ -76,28 +76,31 @@ Item
             Layout.fillWidth: true
             color: UM.Theme.getColor("lining")
         }
-
-        UM.Label
+        ColumnLayout
         {
-            text: catalog.i18nc("@label", "Print settings")
-            font: UM.Theme.getFont("medium")
-        }
+            spacing: UM.Theme.getSize("thin_margin").height
+            UM.Label
+            {
+                text: catalog.i18nc("@label", "Reccomended print settings")
+                font: UM.Theme.getFont("medium")
+            }
 
-        RecommendedStrengthSelector
-        {
-            width: parent.width
-            Layout.fillWidth: true
-        }
+            RecommendedStrengthSelector
+            {
+                width: parent.width
+                Layout.fillWidth: true
+            }
 
-        RecommendedSupportSelector
-        {
-            width: parent.width
-            Layout.fillWidth: true
-        }
+            RecommendedSupportSelector
+            {
+                width: parent.width
+                Layout.fillWidth: true
+            }
 
-        RecommendedAdhesionSelector {
-            width: parent.width
-            Layout.fillWidth: true
+            RecommendedAdhesionSelector {
+                width: parent.width
+                Layout.fillWidth: true
+            }
         }
     }
 
diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml
index e270a31203..0f63a4e2e5 100644
--- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml
+++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml
@@ -77,9 +77,13 @@ Item
     {
         id: settingColumn
         width: parent.width
-        spacing: 0
+        spacing: UM.Theme.getSize("thin_margin").height
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.top: sectionHeader.bottom
+        anchors.topMargin: UM.Theme.getSize("narrow_margin").height
+
+        Layout.preferredHeight: UM.Theme.getSize("recommended_section_setting_item").height
+
     }
 }
\ No newline at end of file
diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml
index a80d735f59..144f78d19e 100644
--- a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml
+++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml
@@ -54,7 +54,6 @@ RecommendedSettingSection
             settingControl: Cura.SingleSettingComboBox
             {
                 width: parent.width
-                height: UM.Theme.getSize("combobox").height
                 settingName: "infill_pattern"
             }
         }
diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
index 119be2c37e..7396f95590 100644
--- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
+++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
@@ -57,7 +57,6 @@ RecommendedSettingSection
             settingControl: Cura.SingleSettingComboBox
             {
                 width: parent.width
-                height: UM.Theme.getSize("combobox").height
                 settingName: "support_structure"
             }
         },
@@ -74,7 +73,6 @@ RecommendedSettingSection
             settingControl: Cura.SingleSettingComboBox
             {
                 width: parent.width
-                height: UM.Theme.getSize("combobox").height
                 settingName: "support_type"
             }
         }
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index 45db2670d1..8ddb29c45d 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -653,6 +653,8 @@
 
         "recommended_button_icon": [1.7, 1.7],
 
+        "recommended_section_setting_item": [14.0, 2.0],
+
         "reset_profile_icon": [1, 1]
     }
 }