GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 04:26:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.2' of github.com:Ultimaker/Cura

Browse Source
This commit is contained in:
Jaime van Kessel 2019-07-30 11:41:51 +02:00
commit fe2412f3a7
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resources/qml/Preferences/Materials/MaterialsPage.qml
View File

@ -45,6 +45,11 @@ Item
materialListView.expandActiveMaterial(active_root_material_id) materialListView.expandActiveMaterial(active_root_material_id)
} }
function setExpandedActiveMaterial(root_material_id)
{
materialListView.expandActiveMaterial(root_material_id)
}
// When loaded, try to select the active material in the tree // When loaded, try to select the active material in the tree
Component.onCompleted: resetExpandedActiveMaterial() Component.onCompleted: resetExpandedActiveMaterial()

2
resources/qml/Preferences/Materials/MaterialsSlot.qml
View File

@ -60,7 +60,7 @@ Rectangle
{ {
materialList.currentBrand = material.brand materialList.currentBrand = material.brand
materialList.currentType = material.brand + "_" + material.material materialList.currentType = material.brand + "_" + material.material
base.currentItem = material base.setExpandedActiveMaterial(material.root_material_id)
} }
hoverEnabled: true hoverEnabled: true
onEntered: { materialSlot.hovered = true } onEntered: { materialSlot.hovered = true }