mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-22 14:18:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(ui/modules/Common/Form/ComboBox): remove getFlattenedModel function

Browse source
This commit is contained in:
Ronan Abhamon 2017-03-15 10:19:23 +01:00
parent c88865df00
commit fc101bd878
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
linphone-desktop/ui/modules/Common/Form/ComboBox.js
View file

@ -25,8 +25,3 @@ function getEntryIcon () {
var iconRole = comboBox.iconRole
return (iconRole.length && item.flattenedModel[iconRole]) || ''
}
function getFlattenedModel () {
return comboBox.textRole.length &&
(typeof modelData !== 'undefined' ? modelData : model)
}

3
linphone-desktop/ui/modules/Common/Form/ComboBox.qml
View file

@ -74,7 +74,8 @@ ComboBox {
delegate: ItemDelegate {
id: item
readonly property var flattenedModel: Logic.getFlattenedModel()
readonly property var flattenedModel: comboBox.textRole.length &&
(typeof modelData !== 'undefined' ? modelData : model)
hoverEnabled: true
width: comboBox.width