From 32c8bbfb3c781288e393ca4c489e88b256391752 Mon Sep 17 00:00:00 2001
From: Diego Prado Gesto <d.pradogesto@ultimaker.com>
Date: Wed, 1 May 2019 15:50:43 +0200
Subject: [PATCH] Modify small UI things in the Add Printer dialog

---
 .../WelcomePages/AddNetworkOrLocalPrinterContent.qml | 12 +++---------
 .../qml/WelcomePages/AddNetworkPrinterScrollView.qml |  2 +-
 resources/qml/WelcomePages/DropDownWidget.qml        |  3 ++-
 resources/qml/WelcomePages/WizardDialog.qml          |  1 +
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml b/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml
index 6037868aaa..73ba179fef 100644
--- a/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml
+++ b/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml
@@ -41,10 +41,7 @@ Item
 
         onClicked:
         {
-            if (contentShown)
-            {
-                addLocalPrinterDropDown.contentShown = false
-            }
+            addLocalPrinterDropDown.contentShown = !contentShown
         }
 
         contentComponent: networkPrinterListComponent
@@ -79,16 +76,13 @@ Item
         anchors.top: addNetworkPrinterDropDown.bottom
         anchors.left: parent.left
         anchors.right: parent.right
-        anchors.topMargin: UM.Theme.getSize("wide_margin").height
+        anchors.topMargin: UM.Theme.getSize("default_margin").height
 
         title: catalog.i18nc("@label", "Add a non-networked printer")
 
         onClicked:
         {
-            if (contentShown)
-            {
-                addNetworkPrinterDropDown.contentShown = false
-            }
+            addNetworkPrinterDropDown.contentShown = !contentShown
         }
 
         contentComponent: localPrinterListComponent
diff --git a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
index 117f8a59d7..5f3ceac116 100644
--- a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
+++ b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
@@ -56,7 +56,7 @@ Item
             ScrollBar.vertical.policy: ScrollBar.AsNeeded
 
             property int maxItemCountAtOnce: 8  // show at max 8 items at once, otherwise you need to scroll.
-            height: maxItemCountAtOnce * UM.Theme.getSize("action_button").height
+            height: Math.min(contentHeight, maxItemCountAtOnce * UM.Theme.getSize("action_button").height)
 
             visible: networkPrinterListView.count > 0
 
diff --git a/resources/qml/WelcomePages/DropDownWidget.qml b/resources/qml/WelcomePages/DropDownWidget.qml
index a54424b7cf..526027ea53 100644
--- a/resources/qml/WelcomePages/DropDownWidget.qml
+++ b/resources/qml/WelcomePages/DropDownWidget.qml
@@ -56,7 +56,8 @@ Item
     Cura.RoundedRectangle
     {
         id: contentRectangle
-        anchors.top: header.bottom
+        // Move up a bit (exaclty the width of the border) to avoid double line
+        y: header.height - UM.Theme.getSize("default_lining").width
         anchors.left: header.left
         anchors.right: header.right
         // Add 2x lining, because it needs a bit of space on the top and the bottom.
diff --git a/resources/qml/WelcomePages/WizardDialog.qml b/resources/qml/WelcomePages/WizardDialog.qml
index 31240b1ef5..ce16ff1f65 100644
--- a/resources/qml/WelcomePages/WizardDialog.qml
+++ b/resources/qml/WelcomePages/WizardDialog.qml
@@ -66,6 +66,7 @@ Window
         anchors.left: parent.left
         anchors.bottom: parent.bottom
         anchors.margins: UM.Theme.getSize("default_margin").width
+        anchors.leftMargin: UM.Theme.getSize("wide_margin").width
 
         enabled: true
         onClicked: dialog.visible = false