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
341a8f48
Commit
341a8f48
authored
Apr 14, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(ui/views/App/Calls/IncallFullscreenWindow): supports preview and it can be moved
parent
b5fd3d98
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
64 additions
and
19 deletions
+64
-19
Camera.cpp
linphone-desktop/src/components/camera/Camera.cpp
+0
-7
Camera.hpp
linphone-desktop/src/components/camera/Camera.hpp
+0
-3
IncallFullscreenWindow.qml
...one-desktop/ui/views/App/Calls/IncallFullscreenWindow.qml
+63
-8
CallStyle.qml
linphone-desktop/ui/views/App/Styles/Calls/CallStyle.qml
+1
-1
No files found.
linphone-desktop/src/components/camera/Camera.cpp
View file @
341a8f48
...
...
@@ -149,9 +149,6 @@ void CameraRenderer::updateWindowId () {
// -----------------------------------------------------------------------------
Camera
::
Camera
(
QQuickItem
*
parent
)
:
QQuickFramebufferObject
(
parent
)
{
setAcceptHoverEvents
(
true
);
setAcceptedMouseButtons
(
Qt
::
LeftButton
|
Qt
::
RightButton
);
// The fbo content must be y-mirrored because the ms rendering is y-inverted.
setMirrorVertically
(
true
);
...
...
@@ -171,10 +168,6 @@ QQuickFramebufferObject::Renderer *Camera::createRenderer () const {
return
new
CameraRenderer
();
}
void
Camera
::
mousePressEvent
(
QMouseEvent
*
)
{
setFocus
(
true
);
}
// -----------------------------------------------------------------------------
CallModel
*
Camera
::
getCall
()
const
{
...
...
linphone-desktop/src/components/camera/Camera.hpp
View file @
341a8f48
...
...
@@ -82,9 +82,6 @@ signals:
void
callChanged
(
CallModel
*
call
);
void
isPreviewChanged
(
bool
isPreview
);
protected:
void
mousePressEvent
(
QMouseEvent
*
event
)
override
;
private:
CallModel
*
getCall
()
const
;
void
setCall
(
CallModel
*
call
);
...
...
linphone-desktop/ui/views/App/Calls/IncallFullscreenWindow.qml
View file @
341a8f48
...
...
@@ -51,18 +51,18 @@ Window {
Keys.onEscapePressed
:
incall
.
close
()
Component
{
id
:
camera
Camera
{
call
:
incall
.
call
}
}
Loader
{
anchors.fill
:
parent
active
:
!
incall
.
callsWindow
.
cameraActivated
sourceComponent
:
camera
Component
{
id
:
camera
Camera
{
call
:
incall
.
call
}
}
}
// -------------------------------------------------------------------------
...
...
@@ -155,6 +155,8 @@ Window {
horizontalAlignment
:
Text
.
AlignHCenter
verticalAlignment
:
Text
.
AlignVCenter
visible
:
!
incall
.
hideButtons
// Not a customizable style.
color
:
'
white
'
style
:
Text
.
Raised
...
...
@@ -314,4 +316,57 @@ Window {
}
}
}
// ---------------------------------------------------------------------------
// Preview.
// ---------------------------------------------------------------------------
Loader
{
active
:
!
incall
.
callsWindow
.
cameraActivated
sourceComponent
:
cameraPreview
Component
{
id
:
cameraPreview
MouseArea
{
property
bool
held
:
false
height
:
CallStyle
.
actionArea
.
userVideo
.
height
width
:
CallStyle
.
actionArea
.
userVideo
.
width
x
:
incall
.
width
/
2
-
width
/
2
y
:
incall
.
height
-
height
drag
{
axis
:
Drag
.
XandYAxis
target
:
camera
}
onPressed
:
held
=
true
onReleased
:
{
held
=
false
y
+=
camera
.
y
x
+=
camera
.
x
camera
.
x
=
0
camera
.
y
=
0
}
Camera
{
id
:
camera
Drag.active
:
parent
.
held
Drag.source
:
parent
Drag.hotSpot.x
:
width
/
2
Drag.hotSpot.y
:
height
/
2
call
:
incall
.
call
isPreview
:
true
height
:
CallStyle
.
actionArea
.
userVideo
.
height
width
:
CallStyle
.
actionArea
.
userVideo
.
width
}
}
}
}
}
linphone-desktop/ui/views/App/Styles/Calls/CallStyle.qml
View file @
341a8f48
...
...
@@ -16,7 +16,7 @@ QtObject {
property
int
rightButtonsGroupMargin
:
50
property
QtObject
userVideo
:
QtObject
{
property
int
height
:
9
0
property
int
height
:
20
0
property
int
width
:
130
}
...
...
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