Merge branch 'modular-bar'
This commit is contained in:
commit
111959e66c
35 changed files with 808 additions and 196 deletions
|
|
@ -16,6 +16,7 @@ ColumnLayout {
|
|||
|
||||
}
|
||||
property string currentKey: ''
|
||||
property string placeholder: ""
|
||||
|
||||
signal selected(string key)
|
||||
|
||||
|
|
@ -61,8 +62,10 @@ ColumnLayout {
|
|||
font.pointSize: Style.fontSizeM * scaling
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
elide: Text.ElideRight
|
||||
text: (combo.currentIndex >= 0 && combo.currentIndex < root.model.count) ? root.model.get(
|
||||
combo.currentIndex).name : ""
|
||||
color: (combo.currentIndex >= 0
|
||||
&& combo.currentIndex < root.model.count) ? Color.mOnSurface : Color.mOnSurfaceVariant
|
||||
text: (combo.currentIndex >= 0
|
||||
&& combo.currentIndex < root.model.count) ? root.model.get(combo.currentIndex).name : root.placeholder
|
||||
}
|
||||
|
||||
indicator: NIcon {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue