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

Simplify code in MaterialsPage.qml

Browse source
This commit is contained in:
Lipu Fei 2018-03-03 16:32:29 +01:00
parent 86b75ae3b6
commit 730048d2b2
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
resources/qml/Preferences/MaterialsPage.qml
View file

@ -344,10 +344,19 @@ Item
Row
{
id: materialRow
spacing: (UM.Theme.getSize("default_margin").width / 2) | 0
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.right: parent.right
property bool isItemActivated:
{
const extruder_position = Cura.ExtruderManager.activeExtruderIndex;
const root_material_id = Cura.MachineManager.currentRootMaterialId[extruder_position];
return model.root_material_id == root_material_id;
}
Rectangle
{
width: Math.floor(parent.height * 0.8)
@ -361,22 +370,14 @@ Item
width: Math.floor((parent.width * 0.3))
text: model.material
elide: Text.ElideRight
font.italic: {
const extruder_position = Cura.ExtruderManager.activeExtruderIndex;
const root_material_id = Cura.MachineManager.currentRootMaterialId[extruder_position];
return model.root_material_id == root_material_id
}
font.italic: materialRow.isItemActivated
color: parent.ListView.isCurrentItem ? palette.highlightedText : palette.text;
}
Label
{
text: (model.name != model.material) ? model.name : ""
elide: Text.ElideRight
font.italic: {
const extruder_position = Cura.ExtruderManager.activeExtruderIndex;
const root_material_id = Cura.MachineManager.currentRootMaterialId[extruder_position];
return model.root_material_id == root_material_id;
}
font.italic: materialRow.isItemActivated
color: parent.ListView.isCurrentItem ? palette.highlightedText : palette.text;
}
}