Commit 8c716a0a authored by Aleksi Suomalainen's avatar Aleksi Suomalainen

[bugfix] Fix for NB#704.

parent 3dad6d94
......@@ -44,7 +44,6 @@ Page {
anchors.centerIn: parent
Label {
text: "Test label"
color: "white"
}
}
}
......@@ -376,7 +376,5 @@ void NemoTheme::loadFromFile(const QString &fileName)
}
// Setting properties for label
QJsonObject stylesLabel = styles.value("label").toObject();
if (stylesLabel.contains("color")) {
m_label->setColor(jsonToColor(styles.value("label"), defines));
}
m_label->setColor(jsonToColor(jsonValue(stylesLabel, "color", "label"), defines));
}
......@@ -24,7 +24,6 @@
NemoThemeLabel::NemoThemeLabel(QObject *parent)
: QObject(parent)
, m_color("white")
{
}
......
......@@ -56,7 +56,7 @@
"secondaryColor": "#0091e5"
},
"label": {
"color": "white"
"color": "#ffffff"
}
}
}
......@@ -207,8 +207,7 @@
"properties": [
{
"name":"color",
"type":"QColor",
"default": "white"
"type":"QColor"
}
]
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment