Merge remote-tracking branch 'origin/4.0'

2025-08-12 16:48:58 +08:00 · 2019-01-14 11:21:28 +01:00 · 2019-01-14 11:21:28 +01:00 · 6876935359
commit 6876935359
parent c6da824203 0ecd00fa1f
1 changed files with 6 additions and 1 deletions
--- a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
+++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
@ -77,7 +77,12 @@ Item
                target: UM.Preferences
                onPreferenceChanged:
                {
-                    customPrintSetup.height = UM.Preferences.getValue("view/settings_list_height");
+                    customPrintSetup.height =
+                        Math.min
+                        (
+                            UM.Preferences.getValue("view/settings_list_height"),
+                            base.height - (customPrintSetup.mapToItem(null, 0, 0).y + buttonRow.height + UM.Theme.getSize("default_margin").height)
+                        );
                }
            }
            visible: currentModeIndex == PrintSetupSelectorContents.Mode.Custom