Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Q
qtquickcontrols-nemo
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
NemoMobile
qtquickcontrols-nemo
Commits
8c716a0a
Commit
8c716a0a
authored
Dec 08, 2013
by
Aleksi Suomalainen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[bugfix] Fix for NB#704.
parent
3dad6d94
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
3 additions
and
8 deletions
+3
-8
LabelPage.qml
examples/touch/content/LabelPage.qml
+0
-1
nemotheme.cpp
src/styles/autogenerated/nemotheme.cpp
+1
-3
nemothemelabel.cpp
src/styles/autogenerated/nemothemelabel.cpp
+0
-1
glacier.json
src/styles/themes/glacier.json
+1
-1
components.json
tools/themehelper/components.json
+1
-2
No files found.
examples/touch/content/LabelPage.qml
View file @
8c716a0a
...
...
@@ -44,7 +44,6 @@ Page {
anchors.centerIn
:
parent
Label
{
text
:
"
Test label
"
color
:
"
white
"
}
}
}
src/styles/autogenerated/nemotheme.cpp
View file @
8c716a0a
...
...
@@ -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
));
}
src/styles/autogenerated/nemothemelabel.cpp
View file @
8c716a0a
...
...
@@ -24,7 +24,6 @@
NemoThemeLabel
::
NemoThemeLabel
(
QObject
*
parent
)
:
QObject
(
parent
)
,
m_color
(
"white"
)
{
}
...
...
src/styles/themes/glacier.json
View file @
8c716a0a
...
...
@@ -56,7 +56,7 @@
"secondaryColor"
:
"#0091e5"
},
"label"
:
{
"color"
:
"
white
"
"color"
:
"
#ffffff
"
}
}
}
tools/themehelper/components.json
View file @
8c716a0a
...
...
@@ -207,8 +207,7 @@
"properties"
:
[
{
"name"
:
"color"
,
"type"
:
"QColor"
,
"default"
:
"white"
"type"
:
"QColor"
}
]
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment