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

Merge branch '5.3'

Browse source
This commit is contained in:
jspijker 2023-03-01 11:33:16 +01:00
commit 2a6227a0a7
2 changed files with 25 additions and 7 deletions
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
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");
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()
@ -126,7 +145,6 @@ Item
width: parent.width
height: UM.Theme.getSize("default_lining").height
color: UM.Theme.getColor("lining")
visible: currentModeIndex == PrintSetupSelectorContents.Mode.Custom
}
Item
@ -135,11 +153,12 @@ Item
property real padding: UM.Theme.getSize("default_margin").width
height:
{
const draggable_area_height = draggableArea.visible ? draggableArea.height : 0;
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
@ -175,7 +194,6 @@ Item
}
height: childrenRect.height
cursorShape: Qt.SplitVCursor
visible: currentModeIndex == PrintSetupSelectorContents.Mode.Custom
drag
{
target: parent

2
resources/texts/change_log.txt
View file

@ -103,7 +103,7 @@
- Added Fusion3 F410, contributed by 64bittuning
- Added Geetech A10Pro, A30Pro, A30T, E180, GiantArmD200, I3ProB, i3ProC, I3PrW, MeCreator, MeCreator2, MeDucer, Mizar, MizarM, MizarMax, MizarMax, MizarPro, and Thunder, contributed by whoseyoung
- Added Klema 180, Klema 250, Klema 250 Pro, Klema 250 Twin, and Klema 500, contributed by polyntsev
- Added Modix V3 BIG-120X, Modix V3 BIG-120Z, Modix V3 BIG-180X, Modix V3 BIG-40, Modix V3 BIG-60, and Modix V3 BIG-Meter, contributed by Modix3D
- Added Modix V3 BIG-120X, V3 BIG-120Z, V3 BIG-180X, V3 BIG-40, V3 BIG-60, V3 BIG-Meter, V4 BIG 60, V4 120x, V4 120z, V4 180x, and V4 BIG-Meter contributed by Modix3D
- Added SnakeOil Standard 180, and SnakeOil Standard 250, contributed by ChipCE
- Added Sovol SV01PRO, SV05, and SV06, contributed by eropple
- Added UMO+ DXU, contributed by ansonl