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

[bugfix] Fix for NB#704.

parent 3dad6d94
...@@ -44,7 +44,6 @@ Page { ...@@ -44,7 +44,6 @@ Page {
anchors.centerIn: parent anchors.centerIn: parent
Label { Label {
text: "Test label" text: "Test label"
color: "white"
} }
} }
} }
...@@ -376,7 +376,5 @@ void NemoTheme::loadFromFile(const QString &fileName) ...@@ -376,7 +376,5 @@ void NemoTheme::loadFromFile(const QString &fileName)
} }
// Setting properties for label // Setting properties for label
QJsonObject stylesLabel = styles.value("label").toObject(); QJsonObject stylesLabel = styles.value("label").toObject();
if (stylesLabel.contains("color")) { m_label->setColor(jsonToColor(jsonValue(stylesLabel, "color", "label"), defines));
m_label->setColor(jsonToColor(styles.value("label"), defines));
}
} }
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
NemoThemeLabel::NemoThemeLabel(QObject *parent) NemoThemeLabel::NemoThemeLabel(QObject *parent)
: QObject(parent) : QObject(parent)
, m_color("white")
{ {
} }
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
"secondaryColor": "#0091e5" "secondaryColor": "#0091e5"
}, },
"label": { "label": {
"color": "white" "color": "#ffffff"
} }
} }
} }
...@@ -207,8 +207,7 @@ ...@@ -207,8 +207,7 @@
"properties": [ "properties": [
{ {
"name":"color", "name":"color",
"type":"QColor", "type":"QColor"
"default": "white"
} }
] ]
} }
......
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