From fddd8213c2335f1d60187d3ee01d280e471dd050 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 18 May 2017 10:55:20 +0200 Subject: [PATCH] feat(ui/views/App/Calls/ConferenceManager): in progress --- .../Form/Fields/ScrollableListViewField.qml | 25 ++++++++++++++++--- .../ui/views/App/Main/MainWindowMenuBar.qml | 2 +- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/linphone-desktop/ui/modules/Common/Form/Fields/ScrollableListViewField.qml b/linphone-desktop/ui/modules/Common/Form/Fields/ScrollableListViewField.qml index c10fa0ab3..9d0827853 100644 --- a/linphone-desktop/ui/modules/Common/Form/Fields/ScrollableListViewField.qml +++ b/linphone-desktop/ui/modules/Common/Form/Fields/ScrollableListViewField.qml @@ -6,11 +6,28 @@ import Common.Styles 1.0 // ============================================================================= Rectangle { - border { - color: TextFieldStyle.background.border.color.normal - width: TextFieldStyle.background.border.width - } + id: field + + default property alias _content: content.data color: TextFieldStyle.background.color.normal radius: TextFieldStyle.background.radius + + Item { + id: content + + anchors.fill: parent + } + + Rectangle { + anchors.fill: parent + + border { + color: TextFieldStyle.background.border.color.normal + width: TextFieldStyle.background.border.width + } + + color: 'transparent' + radius: field.radius + } } diff --git a/linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml b/linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml index 2535584a7..e3a5711ce 100644 --- a/linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml +++ b/linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml @@ -19,7 +19,7 @@ Item { Shortcut { id: settingsShortcut - sequence: "Ctrl+P" + sequence: 'Ctrl+P' onActivated: App.smartShowWindow(App.getSettingsWindow()) }