Index: sources/gui/qml/components/BaseComboBox.qml =================================================================== diff -u -rda2dbdbd92d099e44d11bbfb2b794d5ee19a0f0a -r10d95daf091fedda008906727088648f66ae5bac --- sources/gui/qml/components/BaseComboBox.qml (.../BaseComboBox.qml) (revision da2dbdbd92d099e44d11bbfb2b794d5ee19a0f0a) +++ sources/gui/qml/components/BaseComboBox.qml (.../BaseComboBox.qml) (revision 10d95daf091fedda008906727088648f66ae5bac) @@ -21,7 +21,7 @@ import "qrc:/globals" ComboBox { id: _root - property bool active : true // default leave as regular ComboBox behavior + property bool isActive : true // default leave as regular ComboBox behavior property alias iconSource : _icon.source property alias iconAnchors : _icon.anchors property alias backgroundColor : _background.color @@ -30,29 +30,27 @@ property int delegateHeight : height width : 300 - displayText : _root.active ? currentText : Variables.emptyEntry + displayText : _root.isActive ? currentText : Variables.emptyEntry currentIndex : 0 font.pixelSize : Fonts.fontPixelTextRectTitle leftPadding : 30 signal clear() - onActivated : _root.active = true onClear : { currentIndex = 0 - active = false } contentItem: Text { id: _displayText text : parent.displayText color : Colors.offWhite - font.pixelSize : _root.active ? Fonts.fontPixelTextRectTitle : Fonts.fontPixelValueControl + font.pixelSize : _root.isActive ? Fonts.fontPixelTextRectTitle : Fonts.fontPixelValueControl verticalAlignment : Text.AlignVCenter - horizontalAlignment : _root.active ? undefined : Text.AlignHCenter + horizontalAlignment : _root.isActive ? undefined : Text.AlignHCenter } background: Rectangle { id: _background - color : Colors.highlightMedProgressBar + color : Colors.comboBoxDisplay radius : Variables.dialogRadius }