From 729984d5a9b32c4f0c332cfbd7d3db0873bca8e6 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Fri, 15 Jul 2022 09:38:49 +0200 Subject: [PATCH] Change margins in multimedia parameters. Change border color in new chat group. --- linphone-app/ui/modules/Common/Dialog/DialogPlus.qml | 2 +- linphone-app/ui/modules/Common/Styles/Dialog/DialogStyle.qml | 4 ++-- .../ui/views/App/Styles/Main/Dialogs/NewChatRoomStyle.qml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/linphone-app/ui/modules/Common/Dialog/DialogPlus.qml b/linphone-app/ui/modules/Common/Dialog/DialogPlus.qml index 837f41551..1e6c6d945 100644 --- a/linphone-app/ui/modules/Common/Dialog/DialogPlus.qml +++ b/linphone-app/ui/modules/Common/Dialog/DialogPlus.qml @@ -93,7 +93,7 @@ Rectangle { Layout.fillHeight: (expandHeight ? true : !dialog.contentIsEmpty) Layout.fillWidth: true - Layout.topMargin: (showMargins ? DialogStyle.content.topMargin : 0) + Layout.topMargin: (showMargins ? titleBar.showBar ? 1 : 2 : 0) * DialogStyle.content.topMargin Layout.bottomMargin: (showMargins ? DialogStyle.content.bottomMargin : 0) Layout.leftMargin: (showMargins ? DialogStyle.content.leftMargin : 0) Layout.rightMargin: (showMargins ? DialogStyle.content.rightMargin : 0) diff --git a/linphone-app/ui/modules/Common/Styles/Dialog/DialogStyle.qml b/linphone-app/ui/modules/Common/Styles/Dialog/DialogStyle.qml index 21043f75c..c4f16e5b4 100644 --- a/linphone-app/ui/modules/Common/Styles/Dialog/DialogStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Dialog/DialogStyle.qml @@ -16,7 +16,7 @@ QtObject { } property QtObject buttons: QtObject { - property int bottomMargin: 30 + property int bottomMargin: 25 property int leftMargin: 50 property int rightMargin: 50 property int spacing: 20 @@ -31,7 +31,7 @@ QtObject { property QtObject content: QtObject { property int leftMargin: 25 property int rightMargin: 25 - property int topMargin: 25 + property int topMargin: 10 property int bottomMargin: 25 } diff --git a/linphone-app/ui/views/App/Styles/Main/Dialogs/NewChatRoomStyle.qml b/linphone-app/ui/views/App/Styles/Main/Dialogs/NewChatRoomStyle.qml index f82b5a93d..2e9ad8159 100644 --- a/linphone-app/ui/views/App/Styles/Main/Dialogs/NewChatRoomStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/Dialogs/NewChatRoomStyle.qml @@ -13,7 +13,7 @@ QtObject { property color subjectTitleColor: ColorsList.add(sectionName+'_subject_title', 'g').color property color recentContactTitleColor: ColorsList.add(sectionName+'_recent_contact_title', 'g').color property color recentContactUsernameColor: ColorsList.add(sectionName+'_recent_contact_username', 'g').color - property color addressesBorderColor: ColorsList.add(sectionName+'_addresses_border', 'l').color + property color addressesBorderColor: ColorsList.add(sectionName+'_addresses_border', 'border_light').color property color addressesAdminColor: ColorsList.add(sectionName+'_addresses_admin', 'g').color property color requiredColor: ColorsList.add(sectionName+'_required_text', 'g').color