Merge remote-tracking branch 'origin/4.0'

This commit is contained in:
Lipu Fei 2019-01-14 11:21:28 +01:00
commit 6876935359

View file

@ -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