diff options
| author | trilene <trilene@runbox.com> | 2021-02-21 16:30:10 -0500 |
|---|---|---|
| committer | trilene <trilene@runbox.com> | 2021-02-21 16:30:10 -0500 |
| commit | 70c77cdc44698104c11c222dc630bbcc26a27f3e (patch) | |
| tree | dd4df1a85c7ae0618b16d87803637810ee0dcb0d /resources/qml | |
| parent | Refine X11 test (diff) | |
| download | nheko-70c77cdc44698104c11c222dc630bbcc26a27f3e.tar.xz | |
Display screen sharing content locally
Diffstat (limited to 'resources/qml')
| -rw-r--r-- | resources/qml/TimelineView.qml | 2 | ||||
| -rw-r--r-- | resources/qml/voip/ActiveCallBar.qml | 10 | ||||
| -rw-r--r-- | resources/qml/voip/ScreenShare.qml | 5 |
3 files changed, 10 insertions, 7 deletions
diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml index 0cd129da..07145c7a 100644 --- a/resources/qml/TimelineView.qml +++ b/resources/qml/TimelineView.qml @@ -249,7 +249,7 @@ Page { } Loader { - source: CallManager.isOnCall && CallManager.haveVideo ? "voip/VideoCall.qml" : "" + source: CallManager.isOnCall && CallManager.callType != CallType.VOICE ? "voip/VideoCall.qml" : "" onLoaded: TimelineManager.setVideoCallItem() } 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 |