From 8dbebaa23c0ba8132e0245a62221cababb6bf3b4 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Mon, 31 Dec 2018 13:14:08 +0100
Subject: [PATCH] Ensure that the machine selector list scales properly

The old implementation directly listend to the height (instead of childrenRect).
This caused issues, since other things apart from adding / removing machines could
influence the height.

CURA-6060
---
 resources/qml/PrinterSelector/MachineSelector.qml     | 8 +++++---
 resources/qml/PrinterSelector/MachineSelectorList.qml | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/resources/qml/PrinterSelector/MachineSelector.qml b/resources/qml/PrinterSelector/MachineSelector.qml
index 28e01c7ae9..9f0d3b4ac6 100644
--- a/resources/qml/PrinterSelector/MachineSelector.qml
+++ b/resources/qml/PrinterSelector/MachineSelector.qml
@@ -93,14 +93,16 @@ Cura.ExpandablePopup
                 width: scroll.width - scroll.leftPadding - scroll.rightPadding
                 property real maximumHeight: UM.Theme.getSize("machine_selector_widget_content").height - buttonRow.height
 
-                onHeightChanged:
+                // We use an extra property here, since we only want to to be informed about the content size changes.
+                onContentHeightChanged:
                 {
-                    scroll.height = Math.min(height, maximumHeight)
+                    scroll.height = Math.min(contentHeight, maximumHeight)
                     popup.height = scroll.height + buttonRow.height
                 }
+
                 Component.onCompleted:
                 {
-                    scroll.height = Math.min(height, maximumHeight)
+                    scroll.height = Math.min(contentHeight, maximumHeight)
                     popup.height = scroll.height + buttonRow.height
                 }
 
diff --git a/resources/qml/PrinterSelector/MachineSelectorList.qml b/resources/qml/PrinterSelector/MachineSelectorList.qml
index 62ecf48cc5..604e0f668d 100644
--- a/resources/qml/PrinterSelector/MachineSelectorList.qml
+++ b/resources/qml/PrinterSelector/MachineSelectorList.qml
@@ -10,9 +10,9 @@ import Cura 1.0 as Cura
 ListView
 {
     id: listView
-    height: childrenRect.height
     model: Cura.GlobalStacksModel {}
     section.property: "hasRemoteConnection"
+    property real contentHeight: childrenRect.height
 
     section.delegate: Label
     {