diff --git a/src/mainview/components/CallActionBar.qml b/src/mainview/components/CallActionBar.qml index 3dcd8550567846c5db2435bd7d4a82a0b2c93ab7..e6a08e16b32e5d6b15d3fe0f762c0d3640a6434a 100644 --- a/src/mainview/components/CallActionBar.qml +++ b/src/mainview/components/CallActionBar.qml @@ -50,6 +50,7 @@ Control { signal shareFileClicked signal pluginsClicked signal recordCallClicked + signal fullScreenClicked Component { id: buttonDelegate @@ -220,6 +221,17 @@ Control { icon.color: "white" text: JamiStrings.chat }, + Action { + id: fullScreenAction + icon.source: layoutManager.isCallFullscreen ? + JamiResources.close_fullscreen_24dp_svg : + JamiResources.open_in_full_24dp_svg + icon.color: "white" + onTriggered: root.fullScreenClicked() + text: layoutManager.isCallFullscreen ? + JamiStrings.exitFullScreen : + JamiStrings.fullScreen + }, Action { id: resumePauseCallAction onTriggered: root.resumePauseCallClicked() @@ -345,6 +357,7 @@ Control { CallOverlayModel.addSecondaryControl(shareAction) CallOverlayModel.addSecondaryControl(recordAction) CallOverlayModel.addSecondaryControl(pluginsAction) + CallOverlayModel.addSecondaryControl(fullScreenAction) overflowItemCount = CallOverlayModel.secondaryModel().rowCount() muteAudioAction.checked = isAudioMuted diff --git a/src/mainview/components/CallOverlay.qml b/src/mainview/components/CallOverlay.qml index 2695c7b26cdc32cf06ecc740972ad91bcc69fd41..46a4abd63f7654b2c70870cf5a849eb8f74b6adc 100644 --- a/src/mainview/components/CallOverlay.qml +++ b/src/mainview/components/CallOverlay.qml @@ -49,6 +49,7 @@ Item { property bool localHandRaised signal chatButtonClicked + signal fullScreenClicked ParticipantsLayer { id: __participantsLayer @@ -210,6 +211,7 @@ Item { function onRecordCallClicked() { recordClicked() } function onShareFileClicked() { jamiFileDialog.open() } function onPluginsClicked() { openPluginsMenu() } + function onFullScreenClicked() { root.fullScreenClicked() } } } diff --git a/src/mainview/components/CallViewContextMenu.qml b/src/mainview/components/CallViewContextMenu.qml index d83ab7793d036c06ada54fdbbf412adbd87ff8be..baf4565c28b0e689a23b0b502a9364b73a5ba86f 100644 --- a/src/mainview/components/CallViewContextMenu.qml +++ b/src/mainview/components/CallViewContextMenu.qml @@ -88,10 +88,10 @@ ContextMenuAutoLoader { GeneralMenuItem { id: fullScreen - itemName: layoutManager.callIsFullscreen ? + itemName: layoutManager.isCallFullscreen ? JamiStrings.exitFullScreen : JamiStrings.fullScreen - iconSource: layoutManager.callIsFullscreen ? + iconSource: layoutManager.isCallFullscreen ? JamiResources.close_fullscreen_24dp_svg : JamiResources.open_in_full_24dp_svg onClicked: { diff --git a/src/mainview/components/OngoingCallPage.qml b/src/mainview/components/OngoingCallPage.qml index e91be7e7fd63ef002460daa42cac693e072e032c..2fedf07c5907294ecbc81ff8024a1f5a93527d81 100644 --- a/src/mainview/components/OngoingCallPage.qml +++ b/src/mainview/components/OngoingCallPage.qml @@ -331,6 +331,10 @@ Rectangle { closeInCallConversation() : openInCallConversation() } + + onFullScreenClicked: { + callStackView.toggleFullScreen() + } } ColumnLayout {