3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 06:57:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix setting text fields overlapping in per-object-settings

Browse source 
CURA-10669
This commit is contained in:
c.lamboo 2023-06-13 15:24:59 +02:00
parent 1c0be9c5ed
commit eca903430e
2 changed files with 24 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

85
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View file

@ -167,11 +167,7 @@ Item
onActivated: onActivated:
{ {
if (index == 0){ setMeshType(index === 0 ? infillMeshType : cuttingMeshType);
setMeshType(infillMeshType)
} else {
setMeshType(cuttingMeshType)
}
} }
Binding Binding
@ -204,21 +200,21 @@ Item
model: UM.SettingDefinitionsModel model: UM.SettingDefinitionsModel
{ {
id: addedSettingsModel id: addedSettingsModel
containerId: Cura.MachineManager.activeMachine != null ? Cura.MachineManager.activeMachine.definition.id: "" containerId: Cura.MachineManager.activeMachine !== null ? Cura.MachineManager.activeMachine.definition.id: ""
expanded: ["*"] expanded: ["*"]
filter: filter:
{ {
if (printSequencePropertyProvider.properties.value == "one_at_a_time") if (printSequencePropertyProvider.properties.value === "one_at_a_time")
{ {
return {"settable_per_meshgroup": true} return { settable_per_meshgroup: true }
} }
return {"settable_per_mesh": true} return { settable_per_meshgroup: true }
} }
exclude: exclude:
{ {
var excluded_settings = [ "support_mesh", "anti_overhang_mesh", "cutting_mesh", "infill_mesh" ] const excluded_settings = ["support_mesh", "anti_overhang_mesh", "cutting_mesh", "infill_mesh"]
if (currentMeshType == "support_mesh") if (currentMeshType === "support_mesh")
{ {
excluded_settings = excluded_settings.concat(base.allCategoriesExceptSupport) excluded_settings = excluded_settings.concat(base.allCategoriesExceptSupport)
} }
@ -246,7 +242,6 @@ Item
{ {
id: settingLoader id: settingLoader
width: UM.Theme.getSize("setting").width - removeButton.width - scrollBar.width width: UM.Theme.getSize("setting").width - removeButton.width - scrollBar.width
height: UM.Theme.getSize("section").height + UM.Theme.getSize("narrow_margin").height
enabled: provider.properties.enabled === "True" enabled: provider.properties.enabled === "True"
property var definition: model property var definition: model
property var settingDefinitionsModel: addedSettingsModel property var settingDefinitionsModel: addedSettingsModel
@ -257,7 +252,7 @@ Item
//Qt5.4.2 and earlier has a bug where this causes a crash: https://bugreports.qt.io/browse/QTBUG-35989 //Qt5.4.2 and earlier has a bug where this causes a crash: https://bugreports.qt.io/browse/QTBUG-35989
//In addition, while it works for 5.5 and higher, the ordering of the actual combo box drop down changes, //In addition, while it works for 5.5 and higher, the ordering of the actual combo box drop down changes,
//causing nasty issues when selecting different options. So disable asynchronous loading of enum type completely. //causing nasty issues when selecting different options. So disable asynchronous loading of enum type completely.
asynchronous: model.type != "enum" && model.type != "extruder" asynchronous: model.type !== "enum" && model.type !== "extruder"
onLoaded: onLoaded:
{ {
@ -266,6 +261,7 @@ Item
settingLoader.item.showLinkedSettingIcon = false settingLoader.item.showLinkedSettingIcon = false
settingLoader.item.doDepthIndentation = false settingLoader.item.doDepthIndentation = false
settingLoader.item.doQualityUserSettingEmphasis = false settingLoader.item.doQualityUserSettingEmphasis = false
settingLoader.item.height = UM.Theme.getSize("setting").height + UM.Theme.getSize("narrow_margin").height
} }
sourceComponent: sourceComponent:
@ -362,11 +358,11 @@ Item
if (typeof UM.ActiveTool.properties.getValue("ContainerID") !== "undefined") if (typeof UM.ActiveTool.properties.getValue("ContainerID") !== "undefined")
{ {
const containerId = UM.ActiveTool.properties.getValue("ContainerID") const containerId = UM.ActiveTool.properties.getValue("ContainerID")
if (provider.containerStackId != containerId) if (provider.containerStackId !== containerId)
{ {
provider.containerStackId = containerId provider.containerStackId = containerId
} }
if (inheritStackProvider.containerStackId != containerId) if (inheritStackProvider.containerStackId !== containerId)
{ {
inheritStackProvider.containerStackId = containerId inheritStackProvider.containerStackId = containerId
} }
@ -388,13 +384,13 @@ Item
onClicked: onClicked:
{ {
settingPickDialog.visible = true; settingPickDialog.visible = true;
if (currentMeshType == "support_mesh") if (currentMeshType === "support_mesh")
{ {
settingPickDialog.additional_excluded_settings = base.allCategoriesExceptSupport; settingPickDialog.additional_excluded_settings = base.allCategoriesExceptSupport;
} }
else else
{ {
settingPickDialog.additional_excluded_settings = [] settingPickDialog.additional_excluded_settings = [];
} }
} }
} }
@ -426,52 +422,11 @@ Item
storeIndex: 0 storeIndex: 0
} }
Component Component { id: settingTextField; Cura.SettingTextField { } }
{ Component { id: settingComboBox; Cura.SettingComboBox { } }
id: settingTextField Component { id: settingExtruder; Cura.SettingExtruder { } }
Component { id: settingOptionalExtruder; Cura.SettingOptionalExtruder { } }
Cura.SettingTextField { } Component { id: settingCheckBox; Cura.SettingCheckBox { } }
} Component { id: settingCategory; Cura.SettingCategory { } }
Component { id: settingUnknown; Cura.SettingUnknown { } }
Component
{
id: settingComboBox
Cura.SettingComboBox { }
}
Component
{
id: settingExtruder
Cura.SettingExtruder { }
}
Component
{
id: settingOptionalExtruder
Cura.SettingOptionalExtruder { }
}
Component
{
id: settingCheckBox
Cura.SettingCheckBox { }
}
Component
{
id: settingCategory
Cura.SettingCategory { }
}
Component
{
id: settingUnknown
Cura.SettingUnknown { }
}
} }

2
resources/qml/Settings/SettingItem.qml
View file

@ -13,7 +13,7 @@ import "."
Item Item
{ {
id: base id: base
height: visible ? UM.Theme.getSize("section").height + UM.Theme.getSize("narrow_margin").height : 0 height: enabled ? UM.Theme.getSize("section").height + UM.Theme.getSize("narrow_margin").height : 0
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right