From 48e15daf6410e19fd8eb658061a925c4e714ee1b Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Thu, 6 Dec 2018 11:16:42 +0100
Subject: [PATCH] Fix height of scroll view and make scrollable

Contributes to issue CURA-5876.
---
 resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml  | 2 +-
 .../qml/Menus/ConfigurationMenu/ConfigurationListView.qml    | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
index af2712be44..6ac1e6a2ad 100644
--- a/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
+++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
@@ -14,7 +14,7 @@ Button
     property var configuration: null
     hoverEnabled: true
 
-    height: childrenRect.height
+    height: background.height
 
     background: Rectangle
     {
diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml
index 5a9f72260c..d07337f9c5 100644
--- a/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml
+++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml
@@ -28,7 +28,9 @@ Column
     {
         id: container
         width: parent.width
-        height: Math.min(configurationList.contentHeight, 350 * screenScaleFactor)
+        height: Math.round(Math.min(configurationList.height, 350 * screenScaleFactor))
+        contentHeight: configurationList.height
+        clip: true
 
         ButtonGroup
         {
@@ -41,6 +43,7 @@ Column
             spacing: Math.round(UM.Theme.getSize("default_margin").height / 2)
             width: container.width
             contentHeight: childrenRect.height
+            height: childrenRect.height
 
             section.property: "modelData.printerType"
             section.criteria: ViewSection.FullString