Merge branch 'CURA-8011_Replace_extruder_icons' into CURA-8247_badge_background_colour

This commit is contained in:
Ghostkeeper 2021-07-05 15:19:38 +02:00
commit 43237c91c6
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
39 changed files with 257 additions and 214 deletions

View file

@ -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: