mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-05-07 14:44:01 +00:00
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.
This commit is contained in:
parent
940ef644e3
commit
0df78864d6
7 changed files with 23 additions and 7 deletions
|
|
@ -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")
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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{
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue