mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-16 11:17:49 -06:00
Update extruderIcon to be more in line with the design
CURA-5785
This commit is contained in:
parent
c7dbaa3a00
commit
a9672458fd
3 changed files with 14 additions and 8 deletions
|
@ -9,8 +9,8 @@ Item
|
|||
{
|
||||
id: extruderIconItem
|
||||
|
||||
implicitWidth: UM.Theme.getSize("button").width
|
||||
implicitHeight: implicitWidth
|
||||
implicitWidth: UM.Theme.getSize("extruder_icon").width
|
||||
implicitHeight: UM.Theme.getSize("extruder_icon").height
|
||||
|
||||
property bool checked: true
|
||||
property color materialColor
|
||||
|
@ -22,7 +22,7 @@ Item
|
|||
anchors.fill: parent
|
||||
|
||||
sourceSize.width: parent.width
|
||||
sourceSize.height: parent.width
|
||||
sourceSize.height: parent.height
|
||||
source: UM.Theme.getIcon("extruder_button")
|
||||
color: extruderEnabled ? materialColor: "gray"
|
||||
}
|
||||
|
@ -49,11 +49,13 @@ Item
|
|||
id: extruderNumberText
|
||||
anchors.centerIn: parent
|
||||
text: index + 1
|
||||
font: UM.Theme.getFont("default")
|
||||
font: UM.Theme.getFont("extruder_icon")
|
||||
width: contentWidth
|
||||
height: contentHeight
|
||||
visible: extruderEnabled
|
||||
renderType: Text.NativeRendering
|
||||
horizontalAlignment: Text.alignHCenter
|
||||
verticalAlignment: Text.alignVCenter
|
||||
}
|
||||
|
||||
UM.RecolorImage
|
||||
|
|
|
@ -50,8 +50,7 @@ Cura.ExpandableComponent
|
|||
id: extruderIcon
|
||||
materialColor: model.color
|
||||
extruderEnabled: model.enabled
|
||||
height: parent.height
|
||||
width: height
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
}
|
||||
|
||||
// Label for the brand of the material
|
||||
|
|
|
@ -64,6 +64,12 @@
|
|||
"size": 1.15,
|
||||
"weight": 50,
|
||||
"family": "Noto Sans"
|
||||
},
|
||||
"extruder_icon":
|
||||
{
|
||||
"size": 0.7,
|
||||
"weight": 50,
|
||||
"family": "Noto Sans"
|
||||
}
|
||||
},
|
||||
|
||||
|
@ -406,8 +412,7 @@
|
|||
"thin_margin": [0.71, 0.71],
|
||||
"narrow_margin": [0.5, 0.5],
|
||||
|
||||
"extruder_button_material_margin": [0.70, 0.9],
|
||||
"extruder_button_material": [0.75, 0.75],
|
||||
"extruder_icon": [1.8, 1.8],
|
||||
|
||||
"simple_mode_infill_caption": [0.0, 5.0],
|
||||
"simple_mode_infill_height": [0.0, 8.0],
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue