diff options
| author | Joseph Donofry <joedonofry@gmail.com> | 2021-01-11 17:51:39 -0500 |
|---|---|---|
| committer | Joseph Donofry <joedonofry@gmail.com> | 2021-01-11 17:51:39 -0500 |
| commit | 3ff8b3ad8c015d45a515ca381691cae43fc32a00 (patch) | |
| tree | edec1d1e7926d9c0e0beb68ca604cc6bcdc1ebf6 /resources/qml/TimelineView.qml | |
| parent | Add Ripple effects to qml buttons and avatar (diff) | |
| parent | Merge pull request #372 from deepbluev7/fix-pr-CI (diff) | |
| download | nheko-3ff8b3ad8c015d45a515ca381691cae43fc32a00.tar.xz | |
Merge master and fix conflicts
Diffstat (limited to 'resources/qml/TimelineView.qml')
| -rw-r--r-- | resources/qml/TimelineView.qml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml index 6e9cd665..e596d8e2 100644 --- a/resources/qml/TimelineView.qml +++ b/resources/qml/TimelineView.qml @@ -1,6 +1,7 @@ import "./delegates" import "./device-verification" import "./emoji" +import "./voip" import QtGraphicalEffects 1.0 import QtQuick 2.9 import QtQuick.Controls 2.3 @@ -210,7 +211,7 @@ Page { } Loader { - source: TimelineManager.onVideoCall ? "VideoCall.qml" : "" + source: CallManager.isOnCall && CallManager.isVideo ? "voip/VideoCall.qml" : "" onLoaded: TimelineManager.setVideoCallItem() } @@ -223,6 +224,13 @@ Page { } + CallInviteBar { + id: callInviteBar + + Layout.fillWidth: true + z: 3 + } + ActiveCallBar { Layout.fillWidth: true z: 3 |