Skip to content
Snippets Groups Projects
Commit 93da093b authored by Sébastien Blin's avatar Sébastien Blin
Browse files

callactionbar: add fullscreen button

Also fix a typo causing the icon in the context menu to not update

Change-Id: I8886b45afcc55a3c724494afa10fc125d218d14e
parent f15233b3
No related branches found
No related tags found
No related merge requests found
...@@ -50,6 +50,7 @@ Control { ...@@ -50,6 +50,7 @@ Control {
signal shareFileClicked signal shareFileClicked
signal pluginsClicked signal pluginsClicked
signal recordCallClicked signal recordCallClicked
signal fullScreenClicked
Component { Component {
id: buttonDelegate id: buttonDelegate
...@@ -220,6 +221,17 @@ Control { ...@@ -220,6 +221,17 @@ Control {
icon.color: "white" icon.color: "white"
text: JamiStrings.chat 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 { Action {
id: resumePauseCallAction id: resumePauseCallAction
onTriggered: root.resumePauseCallClicked() onTriggered: root.resumePauseCallClicked()
...@@ -345,6 +357,7 @@ Control { ...@@ -345,6 +357,7 @@ Control {
CallOverlayModel.addSecondaryControl(shareAction) CallOverlayModel.addSecondaryControl(shareAction)
CallOverlayModel.addSecondaryControl(recordAction) CallOverlayModel.addSecondaryControl(recordAction)
CallOverlayModel.addSecondaryControl(pluginsAction) CallOverlayModel.addSecondaryControl(pluginsAction)
CallOverlayModel.addSecondaryControl(fullScreenAction)
overflowItemCount = CallOverlayModel.secondaryModel().rowCount() overflowItemCount = CallOverlayModel.secondaryModel().rowCount()
muteAudioAction.checked = isAudioMuted muteAudioAction.checked = isAudioMuted
......
...@@ -49,6 +49,7 @@ Item { ...@@ -49,6 +49,7 @@ Item {
property bool localHandRaised property bool localHandRaised
signal chatButtonClicked signal chatButtonClicked
signal fullScreenClicked
ParticipantsLayer { ParticipantsLayer {
id: __participantsLayer id: __participantsLayer
...@@ -210,6 +211,7 @@ Item { ...@@ -210,6 +211,7 @@ Item {
function onRecordCallClicked() { recordClicked() } function onRecordCallClicked() { recordClicked() }
function onShareFileClicked() { jamiFileDialog.open() } function onShareFileClicked() { jamiFileDialog.open() }
function onPluginsClicked() { openPluginsMenu() } function onPluginsClicked() { openPluginsMenu() }
function onFullScreenClicked() { root.fullScreenClicked() }
} }
} }
......
...@@ -88,10 +88,10 @@ ContextMenuAutoLoader { ...@@ -88,10 +88,10 @@ ContextMenuAutoLoader {
GeneralMenuItem { GeneralMenuItem {
id: fullScreen id: fullScreen
itemName: layoutManager.callIsFullscreen ? itemName: layoutManager.isCallFullscreen ?
JamiStrings.exitFullScreen : JamiStrings.exitFullScreen :
JamiStrings.fullScreen JamiStrings.fullScreen
iconSource: layoutManager.callIsFullscreen ? iconSource: layoutManager.isCallFullscreen ?
JamiResources.close_fullscreen_24dp_svg : JamiResources.close_fullscreen_24dp_svg :
JamiResources.open_in_full_24dp_svg JamiResources.open_in_full_24dp_svg
onClicked: { onClicked: {
......
...@@ -331,6 +331,10 @@ Rectangle { ...@@ -331,6 +331,10 @@ Rectangle {
closeInCallConversation() : closeInCallConversation() :
openInCallConversation() openInCallConversation()
} }
onFullScreenClicked: {
callStackView.toggleFullScreen()
}
} }
ColumnLayout { ColumnLayout {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment