mirror of
https://github.com/savoirfairelinux/jami-client-qt.git
synced 2026-01-08 23:17:32 +08:00
calls: prevent getting stuck in fullscreen mode when a call ends
Change-Id: I2ac4a683f3857425f59483f73f8511f00158cc30
This commit is contained in:
@@ -86,8 +86,10 @@ CallAdapter::onAccountChanged()
|
||||
void
|
||||
CallAdapter::onCallStatusChanged(const QString& accountId, const QString& callId)
|
||||
{
|
||||
set_hasCall(lrcInstance_->hasActiveCall());
|
||||
|
||||
// :/ one timer for all the call overlays
|
||||
if (!lrcInstance_->hasActiveCall())
|
||||
if (!hasCall_)
|
||||
oneSecondTimer_->stop();
|
||||
|
||||
#ifdef Q_OS_LINUX
|
||||
|
||||
@@ -33,6 +33,7 @@ class SystemTray;
|
||||
class CallAdapter final : public QmlAdapterBase
|
||||
{
|
||||
Q_OBJECT
|
||||
QML_PROPERTY(bool, hasCall)
|
||||
|
||||
public:
|
||||
enum MuteStates { UNMUTED, LOCAL_MUTED, MODERATOR_MUTED, BOTH_MUTED };
|
||||
|
||||
@@ -21,6 +21,8 @@ pragma Singleton
|
||||
|
||||
import QtQuick 2.14
|
||||
|
||||
import net.jami.Adapters 1.0
|
||||
|
||||
Item {
|
||||
readonly property string mainViewLoadPath: "qrc:/src/mainview/MainView.qml"
|
||||
readonly property string wizardViewLoadPath: "qrc:/src/wizardview/WizardView.qml"
|
||||
@@ -29,6 +31,15 @@ Item {
|
||||
property var mainApplicationScreen: ""
|
||||
property bool callIsFullscreen: false
|
||||
|
||||
Connections {
|
||||
target: CallAdapter
|
||||
|
||||
function onHasCallChanged() {
|
||||
if (!CallAdapter.hasCall && callIsFullscreen)
|
||||
callIsFullscreen = false
|
||||
}
|
||||
}
|
||||
|
||||
TextMetrics {
|
||||
id: globalTextMetrics
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user