3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 14:04:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Don't scroll beyond bounds in recommended menu

Browse source 
CURA-10650
This commit is contained in:
c.lamboo 2023-06-06 16:31:36 +02:00
parent 1bf5d740ef
commit 57bece831f
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2022 UltiMaker
// Copyright (c) 2023 UltiMaker
//Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10
@ -9,16 +9,16 @@ import UM 1.6 as UM
import Cura 1.6 as Cura
import ".."
ScrollView
Flickable
{
id: recommendedPrintSetup
clip: true
implicitHeight: settingsColumn.height + 2 * padding
contentHeight: settingsColumn.height
implicitHeight: settingsColumn.height
property bool settingsEnabled: Cura.ExtruderManager.activeExtruderStackId || extrudersEnabledCount.properties.value == 1
padding: UM.Theme.getSize("default_margin").width
function onModeChanged() {}
ScrollBar.vertical: UM.ScrollBar {
@ -31,12 +31,15 @@ ScrollView
}
}
boundsBehavior: Flickable.StopAtBounds
Column
{
id: settingsColumn
padding: UM.Theme.getSize("default_margin").width
spacing: UM.Theme.getSize("default_margin").height
width: recommendedPrintSetup.width - 2 * recommendedPrintSetup.padding - (scroll.visible ? scroll.width : 0)
width: recommendedPrintSetup.width - 2 * padding - (scroll.visible ? scroll.width : 0)
// TODO
property real firstColumnWidth: Math.round(width / 3)
@ -97,7 +100,6 @@ ScrollView
width: parent.width
UM.Label
{
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
text: catalog.i18nc("@label", "Recommended print settings")
font: UM.Theme.getFont("medium")
@ -106,7 +108,6 @@ ScrollView
Cura.SecondaryButton
{
id: customSettingsButton
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right
text: catalog.i18nc("@button", "Show Custom")
textFont: UM.Theme.getFont("medium_bold")