From 0df78864d6eb03b51c46900f8f5c68a7c1eeef0c Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Wed, 29 Jun 2022 18:11:49 +0200 Subject: [PATCH] Set black color for fullscreen mode. Fix layout to remove margins in fullscreen mode. Change checkbox colors when checked. Use black bars on camera view. --- .../components/other/colors/ColorListModel.hpp | 1 + .../ui/modules/Common/Form/CheckBoxText.qml | 18 +++++++++++++++--- .../Common/Styles/Form/CheckBoxTextStyle.qml | 1 + .../ui/modules/Linphone/Camera/CameraView.qml | 2 +- .../Linphone/Styles/Camera/CameraViewStyle.qml | 1 + .../App/Calls/VideoConferenceFullscreen.qml | 4 ++-- .../App/Styles/Calls/VideoConferenceStyle.qml | 3 ++- 7 files changed, 23 insertions(+), 7 deletions(-) diff --git a/linphone-app/src/components/other/colors/ColorListModel.hpp b/linphone-app/src/components/other/colors/ColorListModel.hpp index b65ac26a0..af8d0153f 100644 --- a/linphone-app/src/components/other/colors/ColorListModel.hpp +++ b/linphone-app/src/components/other/colors/ColorListModel.hpp @@ -117,6 +117,7 @@ class ColorListModel : public ProxyListModel { ADD_COLOR("conference_entry_bg", "#D0D8DE", "Conferences : Background entry") ADD_COLOR("conference_out_avatar_bg", "#A1A1A1", "Conferences: Background avatar") ADD_COLOR("conference_bg", "#798791", "Conferences: Background") + ADD_COLOR("fullscreen_conference_bg", "black", "Conferences: Fullscreen background") ADD_COLOR("validation", "#96C11F", "Background for validation on buttons") ADD_COLOR("validation_h", "#7B9D1B", "Hovered background for validation on buttons") diff --git a/linphone-app/ui/modules/Common/Form/CheckBoxText.qml b/linphone-app/ui/modules/Common/Form/CheckBoxText.qml index bb3f05feb..6d1bb4455 100644 --- a/linphone-app/ui/modules/Common/Form/CheckBoxText.qml +++ b/linphone-app/ui/modules/Common/Form/CheckBoxText.qml @@ -47,7 +47,11 @@ CheckBox { : ( checkBox.hovered ? CheckBoxTextStyle.color.hovered - : CheckBoxTextStyle.color.normal + : ( + checkBox.checked + ? CheckBoxTextStyle.color.selected + : CheckBoxTextStyle.color.normal + ) ) implicitHeight: CheckBoxTextStyle.size @@ -63,7 +67,11 @@ CheckBox { ? CheckBoxTextStyle.color.pressed : (checkBox.hovered ? CheckBoxTextStyle.color.hovered - : CheckBoxTextStyle.color.normal + : ( + checkBox.checked + ? CheckBoxTextStyle.color.selected + : CheckBoxTextStyle.color.normal + ) ) height: parent.height - y * 2 @@ -84,7 +92,11 @@ CheckBox { ? CheckBoxTextStyle.color.pressed : (checkBox.hovered ? CheckBoxTextStyle.color.hovered - : CheckBoxTextStyle.color.normal + : ( + checkBox.checked + ? CheckBoxTextStyle.color.selected + : CheckBoxTextStyle.color.normal + ) ) strokeWidth: 2 fillColor: 'transparent' diff --git a/linphone-app/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml index 2ce766fe5..84bf0cc8f 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml @@ -16,5 +16,6 @@ QtObject { property color pressed: ColorsList.add(sectionName+'_p', 'i').color property color hovered: ColorsList.add(sectionName+'_h', 'h').color property color normal: ColorsList.add(sectionName+'_n', 'g').color + property color selected: ColorsList.add(sectionName+'_u', 'i').color } } diff --git a/linphone-app/ui/modules/Linphone/Camera/CameraView.qml b/linphone-app/ui/modules/Linphone/Camera/CameraView.qml index b65f68e48..0756be86a 100644 --- a/linphone-app/ui/modules/Linphone/Camera/CameraView.qml +++ b/linphone-app/ui/modules/Linphone/Camera/CameraView.qml @@ -22,7 +22,7 @@ Item{ property alias isCameraFromDevice: camera.isCameraFromDevice property bool showCloseButton: true property bool showActiveSpeakerOverlay: true - property color color : CameraViewStyle.outBackgroundColor + property color color : camera.isReady ? CameraViewStyle.cameraBackgroundColor : CameraViewStyle.outBackgroundColor signal closeRequested() MouseArea{ diff --git a/linphone-app/ui/modules/Linphone/Styles/Camera/CameraViewStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Camera/CameraViewStyle.qml index 45f29235f..6aee2a9fc 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Camera/CameraViewStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Camera/CameraViewStyle.qml @@ -12,6 +12,7 @@ QtObject { property string sectionName: 'CameraView' property color outBackgroundColor: ColorsList.add(sectionName+'_out_bg', 'conference_out_avatar_bg').color property color inAvatarBackgroundColor: ColorsList.add(sectionName+'_in_bg', 'conference_bg').color + property color cameraBackgroundColor: ColorsList.add(sectionName+'_camera_bg', 'fullscreen_conference_bg').color property int radius : 10 diff --git a/linphone-app/ui/views/App/Calls/VideoConferenceFullscreen.qml b/linphone-app/ui/views/App/Calls/VideoConferenceFullscreen.qml index a956fa492..5199d6a08 100644 --- a/linphone-app/ui/views/App/Calls/VideoConferenceFullscreen.qml +++ b/linphone-app/ui/views/App/Calls/VideoConferenceFullscreen.qml @@ -75,7 +75,7 @@ Window { focus: true Keys.onEscapePressed: window.exit() - color: VideoConferenceStyle.backgroundColor + color: hideButtons ? VideoConferenceStyle.fullBackgroundColor : VideoConferenceStyle.backgroundColor Connections { target: callModel @@ -139,7 +139,7 @@ Window { anchors.left: parent.left anchors.right: parent.right - anchors.topMargin: 10 + anchors.topMargin: window.hideButtons ? 0 : 10 anchors.leftMargin: 25 anchors.rightMargin: 25 spacing: 10 diff --git a/linphone-app/ui/views/App/Styles/Calls/VideoConferenceStyle.qml b/linphone-app/ui/views/App/Styles/Calls/VideoConferenceStyle.qml index f20545e04..8eb197968 100644 --- a/linphone-app/ui/views/App/Styles/Calls/VideoConferenceStyle.qml +++ b/linphone-app/ui/views/App/Styles/Calls/VideoConferenceStyle.qml @@ -9,7 +9,8 @@ import ColorsList 1.0 QtObject { property string sectionName: 'VideoConference' - property color backgroundColor: ColorsList.add(sectionName+'_description', 'conference_bg').color + property color backgroundColor: ColorsList.add(sectionName+'_bg', 'conference_bg').color + property color fullBackgroundColor: ColorsList.add(sectionName+'_fullscreen_bg', 'fullscreen_conference_bg').color property color buzyColor: ColorsList.add(sectionName+'_indicator', 'i').color property QtObject title: QtObject {