From f7d8f6ba160f8b180e0cf22bd8ff0305fb811c15 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 14 Jun 2017 10:08:40 +0200 Subject: [PATCH] feat(ui/views/App/Calls/CallsWindow): do not resize height if it's greater than deskop height --- linphone-desktop/ui/views/App/Calls/CallsWindow.qml | 6 ++++++ linphone-desktop/ui/views/App/Calls/Incall.js | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/linphone-desktop/ui/views/App/Calls/CallsWindow.qml b/linphone-desktop/ui/views/App/Calls/CallsWindow.qml index 9ced3eb7d..d0ffe8df9 100644 --- a/linphone-desktop/ui/views/App/Calls/CallsWindow.qml +++ b/linphone-desktop/ui/views/App/Calls/CallsWindow.qml @@ -46,6 +46,12 @@ Window { Logic.openConferenceManager() } + function setHeight (height) { + window.height = height > Screen.desktopAvailableHeight + ? Screen.desktopAvailableHeight + : height + } + // --------------------------------------------------------------------------- minimumHeight: CallsWindowStyle.minimumHeight diff --git a/linphone-desktop/ui/views/App/Calls/Incall.js b/linphone-desktop/ui/views/App/Calls/Incall.js index e33ba2214..b105d5c83 100644 --- a/linphone-desktop/ui/views/App/Calls/Incall.js +++ b/linphone-desktop/ui/views/App/Calls/Incall.js @@ -35,7 +35,7 @@ function handleCameraFirstFrameReceived (width, height) { return } - window.height += diff + window.setHeight(window.height + diff) } function handleStatusChanged (status) {