3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-05 16:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/master' into CURA-6863_duplicated_material_oddness

Browse source
This commit is contained in:
Lipu Fei 2019-10-14 12:23:49 +02:00
commit 8b913f4009
31 changed files with 103 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

11
resources/qml/Preferences/Materials/MaterialsPage.qml
View file

@ -59,11 +59,14 @@ Item
onCurrentItemChanged:
{
forceActiveFocus()
materialDetailsPanel.currentItem = currentItem
// CURA-6679 If the current item is gone after the model update, reset the current item to the active material.
if (currentItem == null)
if(materialDetailsPanel.currentItem != currentItem)
{
resetExpandedActiveMaterial()
materialDetailsPanel.currentItem = currentItem
// CURA-6679 If the current item is gone after the model update, reset the current item to the active material.
if (currentItem == null)
{
resetExpandedActiveMaterial()
}
}
}

2
resources/qml/Preferences/Materials/MaterialsView.qml
View file

@ -17,7 +17,7 @@ TabView
property QtObject properties
property var currentMaterialNode: null
property bool editingEnabled: false;
property bool editingEnabled: false
property string currency: UM.Preferences.getValue("cura/currency") ? UM.Preferences.getValue("cura/currency") : "€"
property real firstColumnWidth: (width * 0.50) | 0
property real secondColumnWidth: (width * 0.40) | 0

4
resources/qml/Preferences/ProfilesPage.qml
View file

@ -531,8 +531,12 @@ Item
Label
{
anchors.left: parent.left
anchors.right: parent.right
text: base.currentItemDisplayName
font: UM.Theme.getFont("large_bold")
elide: Text.ElideRight
renderType: Text.NativeRendering
}
}