From 70c77cdc44698104c11c222dc630bbcc26a27f3e Mon Sep 17 00:00:00 2001
From: trilene <trilene@runbox.com>
Date: Sun, 21 Feb 2021 16:30:10 -0500
Subject: Display screen sharing content locally

---
 resources/qml/voip/ActiveCallBar.qml | 10 +++++-----
 resources/qml/voip/ScreenShare.qml   |  5 ++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'resources/qml/voip')

diff --git a/resources/qml/voip/ActiveCallBar.qml b/resources/qml/voip/ActiveCallBar.qml
index 5589c79b..d7f3c6fd 100644
--- a/resources/qml/voip/ActiveCallBar.qml
+++ b/resources/qml/voip/ActiveCallBar.qml
@@ -12,7 +12,7 @@ Rectangle {
     MouseArea {
         anchors.fill: parent
         onClicked: {
-            if (CallManager.haveVideo)
+            if (CallManager.callType != CallType.VOICE)
                 stackLayout.currentIndex = stackLayout.currentIndex ? 0 : 1;
 
         }
@@ -139,7 +139,7 @@ Rectangle {
 
                     PropertyChanges {
                         target: stackLayout
-                        currentIndex: CallManager.haveVideo ? 1 : 0
+                        currentIndex: CallManager.callType != CallType.VOICE ? 1 : 0
                     }
 
                 },
@@ -196,15 +196,15 @@ Rectangle {
         }
 
         ImageButton {
-            visible: CallManager.haveLocalCamera
+            visible: CallManager.haveLocalPiP
             width: 24
             height: 24
             buttonTextColor: "#000000"
             image: ":/icons/icons/ui/toggle-camera-view.png"
             hoverEnabled: true
             ToolTip.visible: hovered
-            ToolTip.text: qsTr("Toggle camera view")
-            onClicked: CallManager.toggleCameraView()
+            ToolTip.text: qsTr("Hide/Show Picture-in-Picture")
+            onClicked: CallManager.toggleLocalPiP()
         }
 
         ImageButton {
diff --git a/resources/qml/voip/ScreenShare.qml b/resources/qml/voip/ScreenShare.qml
index cb70a36c..3ff74199 100644
--- a/resources/qml/voip/ScreenShare.qml
+++ b/resources/qml/voip/ScreenShare.qml
@@ -21,7 +21,10 @@ Popup {
 
     ColumnLayout {
         Label {
-            Layout.margins: 8
+            Layout.topMargin: 16
+            Layout.bottomMargin: 16
+            Layout.leftMargin: 8
+            Layout.rightMargin: 8
             Layout.alignment: Qt.AlignLeft
             text: qsTr("Share desktop with %1?").arg(TimelineManager.timeline.roomName)
             color: colors.windowText
-- 
cgit 1.5.1