diff --git a/linphone-desktop/src/components/camera/Camera.cpp b/linphone-desktop/src/components/camera/Camera.cpp index 6a78546ad..5d8cd2bea 100644 --- a/linphone-desktop/src/components/camera/Camera.cpp +++ b/linphone-desktop/src/components/camera/Camera.cpp @@ -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; } diff --git a/linphone-desktop/ui/views/App/IncallFullscreen.qml b/linphone-desktop/ui/views/App/IncallFullscreen.qml index 9e196a0f6..fd302a6b7 100644 --- a/linphone-desktop/ui/views/App/IncallFullscreen.qml +++ b/linphone-desktop/ui/views/App/IncallFullscreen.qml @@ -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. // ------------------------------------------------------------------------- diff --git a/linphone-desktop/ui/views/App/Styles/Calls/CallStyle.qml b/linphone-desktop/ui/views/App/Styles/Calls/CallStyle.qml index f05e6bc66..d6b7d5f84 100644 --- a/linphone-desktop/ui/views/App/Styles/Calls/CallStyle.qml +++ b/linphone-desktop/ui/views/App/Styles/Calls/CallStyle.qml @@ -60,6 +60,7 @@ QtObject { property QtObject elapsedTime: QtObject { property color color: Colors.j property int fontSize: 10 + property int fullscreenFontSize: 12 } } }