Skip to content

Q
qgroundcontrol
Commit 3842435b authored by DonLakeFlyer's avatar DonLakeFlyer
Browse files
Options

Combo boxes have black border on light theme

parent 17129fdd
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
src/QmlControls/QGCComboBox.qml
View file @ 3842435b
...@@ -16,10 +16,11 @@ Button { ...@@ -16,10 +16,11 @@ Button {
readonly property alias count: popupItems.count readonly property alias count: popupItems.count
readonly property alias currentText: popup.currentText readonly property alias currentText: popup.currentText
property var _qgcPal: QGCPalette { colorGroupEnabled: enabled } property bool _showBorder: _qgcPal.globalTheme === QGCPalette.Light
property int _horizontalPadding: ScreenTools.defaultFontPixelWidth property var _qgcPal: QGCPalette { colorGroupEnabled: enabled }
property int _verticalPadding: Math.round(ScreenTools.defaultFontPixelHeight / 2) property int _horizontalPadding: ScreenTools.defaultFontPixelWidth
property var __popup: popup property int _verticalPadding: Math.round(ScreenTools.defaultFontPixelHeight / 2)
property var __popup: popup
signal activated(int index) signal activated(int index)
...@@ -37,6 +38,8 @@ Button { ...@@ -37,6 +38,8 @@ Button {
implicitWidth: ScreenTools.implicitComboBoxWidth implicitWidth: ScreenTools.implicitComboBoxWidth
implicitHeight: ScreenTools.implicitComboBoxHeight implicitHeight: ScreenTools.implicitComboBoxHeight
color: control._qgcPal.button color: control._qgcPal.button
border.width: control._showBorder ? 1: 0
border.color: control._qgcPal.buttonText
QGCColoredImage { QGCColoredImage {
id: image id: image
......
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