Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
40d2540c
Commit
40d2540c
authored
Jun 27, 2017
by
Don Gagne
Browse files
Fix coloring
parent
3ed158a6
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/QmlControls/QGCComboBox.qml
View file @
40d2540c
...
...
@@ -59,13 +59,10 @@ Button {
implicitHeight
:
text
.
implicitHeight
baselineOffset
:
text
.
y
+
text
.
baselineOffset
Text
{
QGCLabel
{
id
:
text
anchors.verticalCenter
:
parent
.
verticalCenter
antialiasing
:
true
text
:
control
.
currentText
font.pointSize
:
pointSize
font.family
:
ScreenTools
.
normalFontFamily
color
:
control
.
_qgcPal
.
buttonText
}
}
...
...
@@ -107,10 +104,12 @@ Button {
__visualItem
:
combo
style
:
MenuStyle
{
font
:
combo
.
font
__labelColor
:
combo
.
_qgcPal
.
text
__selectedLabelColor
:
combo
.
_qgcPal
.
buttonText
font.pointSize
:
ScreenTools
.
defaultFontPointSize
font.family
:
ScreenTools
.
normalFontFamily
__labelColor
:
combo
.
_qgcPal
.
buttonText
__selectedLabelColor
:
combo
.
_qgcPal
.
buttonHighlightText
__selectedBackgroundColor
:
combo
.
_qgcPal
.
buttonHighlight
__backgroundColor
:
combo
.
_qgcPal
.
button
__maxPopupHeight
:
600
__menuItemType
:
"
comboboxitem
"
__scrollerStyle
:
ScrollViewStyle
{
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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