mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-31 10:59:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix preview on grids/active speaker.

Browse source 
Change colors of preview.
This commit is contained in:
Julien Wadel 2022-09-26 16:58:15 +02:00
parent 92f6ed3390
commit 46680c66e6
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
linphone-app/src/components/other/colors/ColorListModel.hpp
View file

@ -123,6 +123,7 @@ class ColorListModel : public ProxyListModel {
ADD_COLOR("conference_bg", "#798791", "Conferences: Background")
ADD_COLOR("conference_avatar_sticker_bg", "#A1A1A1", "Conferences : Background for sticker avatar")
ADD_COLOR("conference_avatar_preview_sticker_bg", "#475663", "Conferences : Background for sticker avatar of preview")
ADD_COLOR("conference_avatar_initials_bg", "#798791", "Conferences : Background for avatar initials")
ADD_COLOR("fullscreen_conference_bg", "black", "Conferences: Fullscreen background")

5
linphone-app/ui/views/App/Calls/IncallActiveSpeaker.qml
View file

@ -85,7 +85,8 @@ Item {
anchors.fill: parent
anchors.margins: 3
deactivateCamera: !mainItem.callModel || !mainItem.showMe || !mainItem.callModel.localVideoEnabled
deactivateCamera: !mainItem.callModel || !mainItem.showMe || !mainItem.callModel.cameraEnabled
//onDeactivateCameraChanged: console.log(deactivateCamera + " = " +mainItem.callModel +" / " +mainItem.showMe +" / " +mainItem.callModel.localVideoEnabled)
currentDevice: allDevices.me
isPreview: true
callModel: mainItem.callModel
@ -93,7 +94,7 @@ Item {
showCloseButton: false
showCustomButton: false
showAvatarBorder: true
avatarStickerBackgroundColor: IncallStyle.container.avatar.stickerBackgroundColor
avatarStickerBackgroundColor: IncallStyle.container.avatar.stickerPreviewBackgroundColor
avatarBackgroundColor: IncallStyle.container.avatar.backgroundColor
}
}

4
linphone-app/ui/views/App/Calls/IncallGrid.qml
View file

@ -37,8 +37,6 @@ Mosaic {
id: gridModel
property ParticipantDeviceProxyModel participantDevices : ParticipantDeviceProxyModel {
id: participantDevices
property bool cameraEnabled: callModel && callModel.cameraEnabled
onCameraEnabledChanged: showMe = cameraEnabled // Do it on changed to ignore hard bindings (that can be override)
showMe: true
}
model: participantDevices
@ -64,7 +62,7 @@ Mosaic {
isPaused: avatarCell.currentDevice && avatarCell.currentDevice.isPaused
showCloseButton: false
showCustomButton: false
avatarStickerBackgroundColor: IncallStyle.container.avatar.stickerBackgroundColor
avatarStickerBackgroundColor: isPreview? IncallStyle.container.avatar.stickerPreviewBackgroundColor : IncallStyle.container.avatar.stickerBackgroundColor
avatarBackgroundColor: IncallStyle.container.avatar.backgroundColor
//onCloseRequested: participantDevices.showMe = false

1
linphone-app/ui/views/App/Styles/Calls/IncallStyle.qml
View file

@ -95,6 +95,7 @@ QtObject {
property QtObject avatar: QtObject {
property color stickerBackgroundColor: ColorsList.add(sectionName+'_container_avatar_sticker_bg', 'conference_avatar_sticker_bg').color
property color stickerPreviewBackgroundColor: ColorsList.add(sectionName+'_container_avatar_preview_sticker_bg', 'conference_avatar_preview_sticker_bg').color
property color backgroundColor: ColorsList.add(sectionName+'_container_avatar_initials_bg', 'conference_avatar_initials_bg').color
property int maxSize: 300