From e1d7b7bf9cdf53e3c58b808d34e857d1d23ad3b6 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 15 Feb 2017 11:01:17 +0100 Subject: [PATCH] fix(app): fix background colors of Chat/ContactEdit --- linphone-desktop/ui/modules/Linphone/Chat/Chat.qml | 6 ++++++ .../ui/modules/Linphone/Styles/ChatStyle.qml | 2 ++ linphone-desktop/ui/views/App/Main/ContactEdit.qml | 5 +++++ .../ui/views/App/Styles/Main/ContactEditStyle.qml | 10 +++++++--- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/linphone-desktop/ui/modules/Linphone/Chat/Chat.qml b/linphone-desktop/ui/modules/Linphone/Chat/Chat.qml index 565366ae9..9d8703a4b 100644 --- a/linphone-desktop/ui/modules/Linphone/Chat/Chat.qml +++ b/linphone-desktop/ui/modules/Linphone/Chat/Chat.qml @@ -23,6 +23,11 @@ ColumnLayout { spacing: 0 + Rectangle { + anchors.fill: parent + color: ChatStyle.color + } + ScrollableListView { id: chat @@ -171,6 +176,7 @@ ColumnLayout { ChatStyle.entry.message.extraContent.leftMargin + ChatStyle.entry.message.outgoing.sendIconSize } + color: ChatStyle.color implicitHeight: layout.height + ChatStyle.entry.bottomMargin // ----------------------------------------------------------------------- diff --git a/linphone-desktop/ui/modules/Linphone/Styles/ChatStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/ChatStyle.qml index 45664b64c..26cdbc253 100644 --- a/linphone-desktop/ui/modules/Linphone/Styles/ChatStyle.qml +++ b/linphone-desktop/ui/modules/Linphone/Styles/ChatStyle.qml @@ -6,6 +6,8 @@ import Common 1.0 // ============================================================================= QtObject { + property color color: Colors.k + property QtObject sectionHeading: QtObject { property int padding: 5 property int bottomMargin: 20 diff --git a/linphone-desktop/ui/views/App/Main/ContactEdit.qml b/linphone-desktop/ui/views/App/Main/ContactEdit.qml index 55e199e29..b1f3a44c6 100644 --- a/linphone-desktop/ui/views/App/Main/ContactEdit.qml +++ b/linphone-desktop/ui/views/App/Main/ContactEdit.qml @@ -277,6 +277,11 @@ ColumnLayout { contentWidth: width - ScrollBar.vertical.width flickableDirection: Flickable.VerticalFlick + Rectangle { + anchors.fill: parent + color: ContactEditStyle.content.color + } + SmartConnect { Component.onCompleted: this.connect(_vcard, 'onVcardUpdated', function () { addresses.setData(_vcard.sipAddresses) diff --git a/linphone-desktop/ui/views/App/Styles/Main/ContactEditStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/ContactEditStyle.qml index 5ed5efa5f..cd425f4ca 100644 --- a/linphone-desktop/ui/views/App/Styles/Main/ContactEditStyle.qml +++ b/linphone-desktop/ui/views/App/Styles/Main/ContactEditStyle.qml @@ -6,6 +6,11 @@ import Common 1.0 // ============================================================================= QtObject { + property QtObject buttons: QtObject { + property int spacing: 20 + property int topMargin: 20 + } + property QtObject infoBar: QtObject { property color color: Colors.e property int avatarSize: 60 @@ -25,9 +30,8 @@ QtObject { } } - property QtObject buttons: QtObject { - property int spacing: 20 - property int topMargin: 20 + property QtObject content: QtObject { + property color color: Colors.k } property QtObject values: QtObject {