Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
50d9baf9
Commit
50d9baf9
authored
Feb 07, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(ui/views/App/Calls/Incall): display correctly preview
parent
68529e33
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
6 deletions
+20
-6
Camera.cpp
linphone-desktop/src/components/camera/Camera.cpp
+5
-0
Incall.qml
linphone-desktop/ui/views/App/Calls/Incall.qml
+15
-6
No files found.
linphone-desktop/src/components/camera/Camera.cpp
View file @
50d9baf9
...
...
@@ -136,6 +136,11 @@ Camera::Camera (QQuickItem *parent) : QQuickFramebufferObject(parent) {
}
Camera
::~
Camera
()
{
if
(
m_is_preview
)
CoreManager
::
getInstance
()
->
getCore
()
->
setNativePreviewWindowId
(
nullptr
);
else
m_call
->
getLinphoneCall
()
->
setNativeVideoWindowId
(
nullptr
);
delete
m_context_info
;
}
...
...
linphone-desktop/ui/views/App/Calls/Incall.qml
View file @
50d9baf9
...
...
@@ -312,21 +312,30 @@ Rectangle {
}
}
// -----------------------------------------------------------------------
// Preview.
// -----------------------------------------------------------------------
Loader
{
anchors.centerIn
:
parent
height
:
CallStyle
.
actionArea
.
userVideo
.
height
width
:
CallStyle
.
actionArea
.
userVideo
.
width
visible
:
incall
.
width
>=
CallStyle
.
actionArea
.
lowWidth
&&
call
.
videoEnabled
&&
!
_fullscreen
Component
{
id
:
preview
Camera
{
anchors.fill
:
parent
call
:
incall
.
call
isPreview
:
true
Component.onCompleted
:
call
=
incall
.
call
}
}
sourceComponent
:
incall
.
width
>=
CallStyle
.
actionArea
.
lowWidth
&&
call
.
videoEnabled
&&
!
_fullscreen
?
preview
:
null
}
ActionBar
{
anchors
{
right
:
parent
.
right
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment