GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-11 22:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'CURA-10076' of github.com:Ultimaker/Cura into 5.3

Browse Source
This commit is contained in:
Jaime van Kessel 2023-03-01 11:12:30 +01:00
commit 10d2235428
No known key found for this signature in database
GPG Key ID: C85F7A3AF1BAA7C4
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
View File

@ -68,9 +68,28 @@ Item
} }
visible: currentModeIndex == PrintSetupSelectorContents.Mode.Recommended visible: currentModeIndex == PrintSetupSelectorContents.Mode.Recommended
height: { height: {
const height = base.height - (customPrintSetup.mapToItem(null, 0, 0).y + buttonRow.height + UM.Theme.getSize("default_margin").height); const height = base.height - (recommendedPrintSetup.mapToItem(null, 0, 0).y + buttonRow.height + UM.Theme.getSize("default_margin").height);
const maxHeight = UM.Preferences.getValue("view/settings_list_height"); const maxHeight = UM.Preferences.getValue("view/settings_list_height");
return Math.min(implicitHeight, height, maxHeight); return Math.min(height, maxHeight);
}
Connections
{
target: UM.Preferences
function onPreferenceChanged(preference)
{
if (preference !== "view/settings_list_height" && preference !== "general/window_height" && preference !== "general/window_state")
{
return;
}
const height = base.height - (recommendedPrintSetup.mapToItem(null, 0, 0).y + buttonRow.height + UM.Theme.getSize("default_margin").height);
const maxHeight = UM.Preferences.getValue("view/settings_list_height");
recommendedPrintSetup.height = Math.min(maxHeight, height);
updateDragPosition();
}
} }
function onModeChanged() function onModeChanged()
@ -126,7 +145,6 @@ Item
width: parent.width width: parent.width
height: UM.Theme.getSize("default_lining").height height: UM.Theme.getSize("default_lining").height
color: UM.Theme.getColor("lining") color: UM.Theme.getColor("lining")
visible: currentModeIndex == PrintSetupSelectorContents.Mode.Custom
} }
Item Item
@ -135,11 +153,12 @@ Item
property real padding: UM.Theme.getSize("default_margin").width property real padding: UM.Theme.getSize("default_margin").width
height: height:
{ {
const draggable_area_height = draggableArea.visible ? draggableArea.height : 0;
if (currentModeIndex == PrintSetupSelectorContents.Mode.Custom) if (currentModeIndex == PrintSetupSelectorContents.Mode.Custom)
{ {
return recommendedButton.height + 2 * padding + (draggableArea.visible ? draggableArea.height : 0) return recommendedButton.height + 2 * padding + draggable_area_height;
} }
return 0 return draggable_area_height;
} }
anchors anchors
@ -175,7 +194,6 @@ Item
} }
height: childrenRect.height height: childrenRect.height
cursorShape: Qt.SplitVCursor cursorShape: Qt.SplitVCursor
visible: currentModeIndex == PrintSetupSelectorContents.Mode.Custom
drag drag
{ {
target: parent target: parent