From 175121e86c95d2c8309fcf4ed7868b3f278f5985 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 1 Apr 2020 17:31:23 +0200 Subject: [PATCH] Fix add printer scrollview overlaps buttons. CURA-7336 --- resources/qml/WelcomePages/AddLocalPrinterScrollView.qml | 2 +- resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml index fce616472f..50ceeff8a9 100644 --- a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml +++ b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml @@ -75,7 +75,7 @@ Item anchors.right: parent.right anchors.top: parent.top - height: maxItemCountAtOnce * UM.Theme.getSize("action_button").height + height: (maxItemCountAtOnce * UM.Theme.getSize("action_button").height) - UM.Theme.getSize("default_margin").height ScrollBar.horizontal.policy: ScrollBar.AlwaysOff ScrollBar.vertical.policy: ScrollBar.AsNeeded diff --git a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml index b9bd9c4a65..b4d4fee42c 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: Math.min(contentHeight, maxItemCountAtOnce * UM.Theme.getSize("action_button").height) + height: Math.min(contentHeight, (maxItemCountAtOnce * UM.Theme.getSize("action_button").height) - UM.Theme.getSize("default_margin").height) visible: networkPrinterListView.count > 0