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
ffd3b4b4
Commit
ffd3b4b4
authored
Feb 07, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(ui/views/App/IncallFullscreen): display correctly timer
parent
e60efba8
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
24 deletions
+30
-24
Camera.cpp
linphone-desktop/src/components/camera/Camera.cpp
+0
-6
IncallFullscreen.qml
linphone-desktop/ui/views/App/IncallFullscreen.qml
+29
-18
CallStyle.qml
linphone-desktop/ui/views/App/Styles/Calls/CallStyle.qml
+1
-0
No files found.
linphone-desktop/src/components/camera/Camera.cpp
View file @
ffd3b4b4
...
...
@@ -136,12 +136,6 @@ Camera::Camera (QQuickItem *parent) : QQuickFramebufferObject(parent) {
}
Camera
::~
Camera
()
{
// Reset context in ms filter.
if
(
m_is_preview
)
CoreManager
::
getInstance
()
->
getCore
()
->
setNativePreviewWindowId
(
nullptr
);
else
m_call
->
getLinphoneCall
()
->
setNativeVideoWindowId
(
nullptr
);
delete
m_context_info
;
}
...
...
linphone-desktop/ui/views/App/IncallFullscreen.qml
View file @
ffd3b4b4
...
...
@@ -95,6 +95,35 @@ Window {
}
}
// -----------------------------------------------------------------------
// Timer.
// -----------------------------------------------------------------------
Text
{
id
:
elapsedTime
anchors.fill
:
parent
font.pointSize
:
CallStyle
.
header
.
elapsedTime
.
fullscreenFontSize
horizontalAlignment
:
Text
.
AlignHCenter
verticalAlignment
:
Text
.
AlignVCenter
// Not a customizable style.
color
:
'
white
'
style
:
Text
.
Raised
styleColor
:
'
black
'
Component.onCompleted
:
{
var
updateDuration
=
function
()
{
text
=
Utils
.
formatElapsedTime
(
call
.
duration
)
Utils
.
setTimeout
(
elapsedTime
,
1000
,
updateDuration
)
}
updateDuration
()
}
}
// -----------------------------------------------------------------------
// Video actions.
// -----------------------------------------------------------------------
...
...
@@ -125,24 +154,6 @@ Window {
}
}
Text
{
id
:
elapsedTime
Layout.fillWidth
:
true
color
:
CallStyle
.
header
.
elapsedTime
.
color
font.pointSize
:
CallStyle
.
header
.
elapsedTime
.
fontSize
horizontalAlignment
:
Text
.
AlignHCenter
Component.onCompleted
:
{
var
updateDuration
=
function
()
{
text
=
Utils
.
formatElapsedTime
(
call
.
duration
)
Utils
.
setTimeout
(
elapsedTime
,
1000
,
updateDuration
)
}
updateDuration
()
}
}
// -------------------------------------------------------------------------
// Action Buttons.
// -------------------------------------------------------------------------
...
...
linphone-desktop/ui/views/App/Styles/Calls/CallStyle.qml
View file @
ffd3b4b4
...
...
@@ -60,6 +60,7 @@ QtObject {
property
QtObject
elapsedTime
:
QtObject
{
property
color
color
:
Colors
.
j
property
int
fontSize
:
10
property
int
fullscreenFontSize
:
12
}
}
}
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