mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-24 23:28:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(ui/views/App/Calls/IncallFullscreenWindow): connect once to visibility changed to call showFullScreen

Browse source
This commit is contained in:
Ronan Abhamon 2017-06-07 10:02:55 +02:00
parent 63230fc052
commit bd6a2a899c
2 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linphone-desktop/ui/views/App/Calls/Incall.js
View file

@ -20,7 +20,7 @@ function handleStatusChanged (status) {
if (status === Linphone.CallModel.CallStatusEnded) {
var fullscreen = incall._fullscreen
if (fullscreen) {
fullscreen.close()
fullscreen.exit()
}
telKeypad.visible = false

34
linphone-desktop/ui/views/App/Calls/IncallFullscreenWindow.qml
View file

@ -20,11 +20,12 @@ Window {
property var callsWindow
property bool hideButtons: false
property bool sFullScreen: true
// ---------------------------------------------------------------------------
function _exit (cb) {
function exit (cb) {
// It's necessary to call `showNormal` before close on MacOs
// because the dock will be hidden forever!
incall.showNormal()
incall.close()
@ -35,18 +36,22 @@ Window {
// ---------------------------------------------------------------------------
onVisibilityChanged: {
if (sFullScreen && visibility === Window.Windowed) {
incall.showFullScreen()
sFullScreen = false
Component.onCompleted: {
var show = function (visibility) {
if (visibility === Window.Windowed) {
incall.visibilityChanged.disconnect(show)
incall.showFullScreen()
}
}
}
incall.visibilityChanged.connect(show)
}
// ---------------------------------------------------------------------------
Shortcut {
sequence: StandardKey.Close
onActivated: _exit()
onActivated: incall.exit()
}
// ---------------------------------------------------------------------------
@ -56,10 +61,7 @@ Window {
color: '#000000' // Not a style.
focus: true
Keys.onEscapePressed: {
incall.showNormal()
incall.close()
}
Keys.onEscapePressed: incall.exit()
Loader {
anchors.fill: parent
@ -218,7 +220,7 @@ Window {
ActionButton {
icon: 'fullscreen'
onClicked: _exit()
onClicked: incall.exit()
}
}
}
@ -300,7 +302,7 @@ Window {
iconSize: CallStyle.actionArea.iconSize
updating: call.updating
onClicked: _exit(function () { call.videoEnabled = false })
onClicked: incall.exit(function () { call.videoEnabled = false })
}
ActionButton {
@ -326,13 +328,13 @@ Window {
icon: 'pause'
updating: call.updating
onClicked: _exit(function () { call.pausedByUser = enabled })
onClicked: incall.exit(function () { call.pausedByUser = enabled })
}
ActionButton {
icon: 'hangup'
onClicked: _exit(call.terminate)
onClicked: incall.exit(call.terminate)
}
}
}