mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-03 22:56:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix(ui/views/App/IncallFullscreen): display correctly timer

Browse source
This commit is contained in:
Ronan Abhamon 2017-02-07 14:38:05 +01:00
parent e60efba868
commit ffd3b4b460
3 changed files with 30 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
linphone-desktop/src/components/camera/Camera.cpp
View file

@ -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;
}

47
linphone-desktop/ui/views/App/IncallFullscreen.qml
View file

@ -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.
// -------------------------------------------------------------------------

1
linphone-desktop/ui/views/App/Styles/Calls/CallStyle.qml
View file

@ -60,6 +60,7 @@ QtObject {
property QtObject elapsedTime: QtObject {
property color color: Colors.j
property int fontSize: 10
property int fullscreenFontSize: 12
}
}
}