mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-06 21:44:01 -06:00
Merge branch 'CURA-8011_Replace_extruder_icons' into CURA-8247_badge_background_colour
This commit is contained in:
commit
43237c91c6
39 changed files with 257 additions and 214 deletions
|
@ -93,11 +93,11 @@ Cura.ExpandablePopup
|
|||
{
|
||||
if (isGroup)
|
||||
{
|
||||
return UM.Theme.getIcon("PrinterTriple")
|
||||
return UM.Theme.getIcon("PrinterTriple", "medium")
|
||||
}
|
||||
else if (isNetworkPrinter || isCloudRegistered)
|
||||
{
|
||||
return UM.Theme.getIcon("Printer")
|
||||
return UM.Theme.getIcon("Printer", "medium")
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -114,8 +114,9 @@ Cura.ExpandablePopup
|
|||
anchors
|
||||
{
|
||||
bottom: parent.bottom
|
||||
bottomMargin: - height * 1 / 6
|
||||
left: parent.left
|
||||
leftMargin: UM.Theme.getSize("thick_margin").width
|
||||
leftMargin: iconSize - width * 5 / 6
|
||||
}
|
||||
|
||||
source:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue