Index: sources/gui/qml/components/BaseComboBox.qml =================================================================== diff -u -rf7b92a45b2b7fa814fba3d080bcf91d465f279df -r9c818f9b2600fa0fb9375f5923bf01ffcbb17e0f --- sources/gui/qml/components/BaseComboBox.qml (.../BaseComboBox.qml) (revision f7b92a45b2b7fa814fba3d080bcf91d465f279df) +++ sources/gui/qml/components/BaseComboBox.qml (.../BaseComboBox.qml) (revision 9c818f9b2600fa0fb9375f5923bf01ffcbb17e0f) @@ -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 @@ -31,27 +31,27 @@ property int actualValue : 0 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 + onActivated : _root.isActive = true onClear : { currentIndex = 0 - active = false + isActive = false } function refresh () { currentIndex = actualValue } 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