From 3842435b902d7abe8a2588d6ac5a6a6cd66c8c76 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Wed, 24 May 2017 16:21:43 -0700 Subject: [PATCH] Combo boxes have black border on light theme --- src/QmlControls/QGCComboBox.qml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/QmlControls/QGCComboBox.qml b/src/QmlControls/QGCComboBox.qml index 32634b505c..72590ad013 100644 --- a/src/QmlControls/QGCComboBox.qml +++ b/src/QmlControls/QGCComboBox.qml @@ -16,10 +16,11 @@ Button { readonly property alias count: popupItems.count readonly property alias currentText: popup.currentText - property var _qgcPal: QGCPalette { colorGroupEnabled: enabled } - property int _horizontalPadding: ScreenTools.defaultFontPixelWidth - property int _verticalPadding: Math.round(ScreenTools.defaultFontPixelHeight / 2) - property var __popup: popup + property bool _showBorder: _qgcPal.globalTheme === QGCPalette.Light + property var _qgcPal: QGCPalette { colorGroupEnabled: enabled } + property int _horizontalPadding: ScreenTools.defaultFontPixelWidth + property int _verticalPadding: Math.round(ScreenTools.defaultFontPixelHeight / 2) + property var __popup: popup signal activated(int index) @@ -37,6 +38,8 @@ Button { implicitWidth: ScreenTools.implicitComboBoxWidth implicitHeight: ScreenTools.implicitComboBoxHeight color: control._qgcPal.button + border.width: control._showBorder ? 1: 0 + border.color: control._qgcPal.buttonText QGCColoredImage { id: image -- GitLab