Ensure that all icons use the same color from theme.

Also added some fixes for the dark theme
This commit is contained in:
Jaime van Kessel 2018-12-14 11:59:22 +01:00
parent 15cd2a9269
commit 6a3ac99551
6 changed files with 13 additions and 5 deletions

View file

@ -15,7 +15,7 @@ UM.RecolorImage
width: UM.Theme.getSize("section_icon").width
height: UM.Theme.getSize("section_icon").height
color: popup.opened ? UM.Theme.getColor("primary") : UM.Theme.getColor("text_medium")
color: UM.Theme.getColor("icon")
MouseArea
{

View file

@ -18,7 +18,7 @@ Item
property alias color: label.color
property alias text: label.text
property alias font: label.font
property alias iconColor: icon.color
property real margin: UM.Theme.getSize("narrow_margin").width
// These properties can be used in combination with layouts.
@ -39,7 +39,7 @@ Item
width: UM.Theme.getSize("section_icon").width
height: UM.Theme.getSize("section_icon").height
color: label.color
color: UM.Theme.getColor("icon")
anchors
{

View file

@ -67,7 +67,7 @@ Item
toolItem: UM.RecolorImage
{
source: UM.Theme.getIcon(model.icon) != "" ? UM.Theme.getIcon(model.icon) : "file:///" + model.location + "/" + model.icon
color: UM.Theme.getColor("toolbar_button_text")
color: UM.Theme.getColor("icon")
sourceSize: UM.Theme.getSize("button_icon")
}