diff --git a/linphone-desktop/resources.qrc b/linphone-desktop/resources.qrc
index 22e67ca50..adfc8035d 100644
--- a/linphone-desktop/resources.qrc
+++ b/linphone-desktop/resources.qrc
@@ -192,6 +192,7 @@
ui/modules/Common/Form/Fields/NumericField.qml
ui/modules/Common/Form/Fields/PasswordField.qml
ui/modules/Common/Form/Fields/PortField.qml
+ ui/modules/Common/Form/Fields/ScrollableListViewField.qml
ui/modules/Common/Form/Fields/TextAreaField.qml
ui/modules/Common/Form/Fields/TextField.qml
ui/modules/Common/Form/+linux/SearchBox.qml
diff --git a/linphone-desktop/ui/modules/Common/Form/Fields/ScrollableListViewField.qml b/linphone-desktop/ui/modules/Common/Form/Fields/ScrollableListViewField.qml
new file mode 100644
index 000000000..969662c26
--- /dev/null
+++ b/linphone-desktop/ui/modules/Common/Form/Fields/ScrollableListViewField.qml
@@ -0,0 +1,20 @@
+import QtQuick 2.7
+
+import Common 1.0
+import Common.Styles 1.0
+
+// =============================================================================
+
+Rectangle {
+ border {
+ color: TextFieldStyle.background.border.color.normal
+ width: TextFieldStyle.background.border.width
+ }
+
+ color: TextFieldStyle.background.color.normal
+ radius: TextFieldStyle.background.radius
+
+ ScrollableListView {
+ anchors.fill: parent
+ }
+}
diff --git a/linphone-desktop/ui/modules/Common/qmldir b/linphone-desktop/ui/modules/Common/qmldir
index c0976f0e7..fc6483c2c 100644
--- a/linphone-desktop/ui/modules/Common/qmldir
+++ b/linphone-desktop/ui/modules/Common/qmldir
@@ -6,78 +6,79 @@ module Common
# Constants --------------------------------------------------------------------
-singleton Colors 1.0 Constants/Colors.qml
-singleton Constants 1.0 Constants/Constants.qml
+singleton Colors 1.0 Constants/Colors.qml
+singleton Constants 1.0 Constants/Constants.qml
# Components -------------------------------------------------------------------
-BusyIndicator 1.0 Animations/BusyIndicator.qml
+BusyIndicator 1.0 Animations/BusyIndicator.qml
-ConfirmDialog 1.0 Dialog/ConfirmDialog.qml
-DialogPlus 1.0 Dialog/DialogPlus.qml
+ConfirmDialog 1.0 Dialog/ConfirmDialog.qml
+DialogPlus 1.0 Dialog/DialogPlus.qml
-ActionBar 1.0 Form/ActionBar.qml
-ActionButton 1.0 Form/ActionButton.qml
-ActionSwitch 1.0 Form/ActionSwitch.qml
-CheckBoxText 1.0 Form/CheckBoxText.qml
-ComboBox 1.0 Form/ComboBox.qml
-DroppableTextArea 1.0 Form/DroppableTextArea.qml
-ListForm 1.0 Form/ListForm.qml
-SearchBox 1.0 Form/SearchBox.qml
-StaticListForm 1.0 Form/StaticListForm.qml
-Switch 1.0 Form/Switch.qml
-TransparentTextInput 1.0 Form/TransparentTextInput.qml
+ActionBar 1.0 Form/ActionBar.qml
+ActionButton 1.0 Form/ActionButton.qml
+ActionSwitch 1.0 Form/ActionSwitch.qml
+CheckBoxText 1.0 Form/CheckBoxText.qml
+ComboBox 1.0 Form/ComboBox.qml
+DroppableTextArea 1.0 Form/DroppableTextArea.qml
+ListForm 1.0 Form/ListForm.qml
+SearchBox 1.0 Form/SearchBox.qml
+StaticListForm 1.0 Form/StaticListForm.qml
+Switch 1.0 Form/Switch.qml
+TransparentTextInput 1.0 Form/TransparentTextInput.qml
-ExclusiveButtons 1.0 Form/Buttons/ExclusiveButtons.qml
-FileChooserButton 1.0 Form/Buttons/FileChooserButton.qml
-TextButtonA 1.0 Form/Buttons/TextButtonA.qml
-TextButtonB 1.0 Form/Buttons/TextButtonB.qml
+ExclusiveButtons 1.0 Form/Buttons/ExclusiveButtons.qml
+FileChooserButton 1.0 Form/Buttons/FileChooserButton.qml
+TextButtonA 1.0 Form/Buttons/TextButtonA.qml
+TextButtonB 1.0 Form/Buttons/TextButtonB.qml
-HexField 1.0 Form/Fields/HexField.qml
-NumericField 1.0 Form/Fields/NumericField.qml
-PasswordField 1.0 Form/Fields/PasswordField.qml
-PortField 1.0 Form/Fields/PortField.qml
-TextAreaField 1.0 Form/Fields/TextAreaField.qml
-TextField 1.0 Form/Fields/TextField.qml
+HexField 1.0 Form/Fields/HexField.qml
+NumericField 1.0 Form/Fields/NumericField.qml
+PasswordField 1.0 Form/Fields/PasswordField.qml
+PortField 1.0 Form/Fields/PortField.qml
+ScrollableListViewField 1.0 Form/Fields/ScrollableListViewField.qml
+TextAreaField 1.0 Form/Fields/TextAreaField.qml
+TextField 1.0 Form/Fields/TextField.qml
-Form 1.0 Form/Placements/Form.qml
-FormEmptyLine 1.0 Form/Placements/FormEmptyLine.qml
-FormGroup 1.0 Form/Placements/FormGroup.qml
-FormLine 1.0 Form/Placements/FormLine.qml
-FormTable 1.0 Form/Placements/FormTable.qml
-FormTableEntry 1.0 Form/Placements/FormTableEntry.qml
-FormTableLine 1.0 Form/Placements/FormTableLine.qml
+Form 1.0 Form/Placements/Form.qml
+FormEmptyLine 1.0 Form/Placements/FormEmptyLine.qml
+FormGroup 1.0 Form/Placements/FormGroup.qml
+FormLine 1.0 Form/Placements/FormLine.qml
+FormTable 1.0 Form/Placements/FormTable.qml
+FormTableEntry 1.0 Form/Placements/FormTableEntry.qml
+FormTableLine 1.0 Form/Placements/FormTableLine.qml
-TabBar 1.0 Form/Tab/TabBar.qml
-TabButton 1.0 Form/Tab/TabButton.qml
-TabContainer 1.0 Form/Tab/TabContainer.qml
+TabBar 1.0 Form/Tab/TabBar.qml
+TabButton 1.0 Form/Tab/TabButton.qml
+TabContainer 1.0 Form/Tab/TabContainer.qml
-DragBox 1.0 Helpers/DragBox.qml
-InvertedMouseArea 1.0 Helpers/InvertedMouseArea.qml
+DragBox 1.0 Helpers/DragBox.qml
+InvertedMouseArea 1.0 Helpers/InvertedMouseArea.qml
-Icon 1.0 Image/Icon.qml
-RoundedImage 1.0 Image/RoundedImage.qml
+Icon 1.0 Image/Icon.qml
+RoundedImage 1.0 Image/RoundedImage.qml
-VuMeter 1.0 Indicators/VuMeter.qml
+VuMeter 1.0 Indicators/VuMeter.qml
-ActionMenu 1.0 Menus/ActionMenu.qml
-ActionMenuEntry 1.0 Menus/ActionMenuEntry.qml
-Menu 1.0 Menus/Menu.qml
+ActionMenu 1.0 Menus/ActionMenu.qml
+ActionMenuEntry 1.0 Menus/ActionMenuEntry.qml
+Menu 1.0 Menus/Menu.qml
-Borders 1.0 Misc/Borders.qml
-Collapse 1.0 Misc/Collapse.qml
-ForceScrollBar 1.0 Misc/ForceScrollBar.qml
-Paned 1.0 Misc/Paned.qml
+Borders 1.0 Misc/Borders.qml
+Collapse 1.0 Misc/Collapse.qml
+ForceScrollBar 1.0 Misc/ForceScrollBar.qml
+Paned 1.0 Misc/Paned.qml
-AbstractDropDownMenu 1.0 Popup/AbstractDropDownMenu.qml
-DesktopPopup 1.0 Popup/DesktopPopup.qml
-DropDownDynamicMenu 1.0 Popup/DropDownDynamicMenu.qml
-DropDownMenu 1.0 Popup/DropDownMenu.qml
-PopupShadow 1.0 Popup/PopupShadow.qml
+AbstractDropDownMenu 1.0 Popup/AbstractDropDownMenu.qml
+DesktopPopup 1.0 Popup/DesktopPopup.qml
+DropDownDynamicMenu 1.0 Popup/DropDownDynamicMenu.qml
+DropDownMenu 1.0 Popup/DropDownMenu.qml
+PopupShadow 1.0 Popup/PopupShadow.qml
-TooltipArea 1.0 Tooltip/TooltipArea.qml
+TooltipArea 1.0 Tooltip/TooltipArea.qml
-ScrollableListView 1.0 View/ScrollableListView.qml
+ScrollableListView 1.0 View/ScrollableListView.qml
-ApplicationWindow 1.0 Window/ApplicationWindow.qml
-Window 1.0 Window/Window.qml
+ApplicationWindow 1.0 Window/ApplicationWindow.qml
+Window 1.0 Window/Window.qml
diff --git a/linphone-desktop/ui/views/App/Calls/ConferenceManager.qml b/linphone-desktop/ui/views/App/Calls/ConferenceManager.qml
index d6975a011..7c5cf6ab9 100644
--- a/linphone-desktop/ui/views/App/Calls/ConferenceManager.qml
+++ b/linphone-desktop/ui/views/App/Calls/ConferenceManager.qml
@@ -31,17 +31,28 @@ ConfirmDialog {
// Address selector.
// -------------------------------------------------------------------------
- Column {
- Layout.alignment: Qt.AlignTop
+ Item {
+ Layout.fillHeight: true
Layout.fillWidth: true
- spacing: ConferenceManagerStyle.columns.selector.spacing
+ ColumnLayout {
+ anchors.fill: parent
+ spacing: ConferenceManagerStyle.columns.selector.spacing
- TextField {
- icon: 'search'
- width: parent.width
+ TextField {
+ id: filter
- onTextChanged: Logic.updateFilter(text)
+ Layout.fillWidth: true
+
+ icon: 'search'
+
+ onTextChanged: Logic.updateFilter(text)
+ }
+
+ ScrollableListViewField {
+ Layout.fillHeight: true
+ Layout.fillWidth: true
+ }
}
}
@@ -62,8 +73,9 @@ ConfirmDialog {
// See and remove selected addresses.
// -------------------------------------------------------------------------
- Column {
- Layout.alignment: Qt.AlignTop
+ ScrollableListViewField {
+ Layout.topMargin: filter.height + ConferenceManagerStyle.columns.selector.spacing
+ Layout.fillHeight: true
Layout.fillWidth: true
}
}