mirror of
https://git.jami.net/savoirfairelinux/jami-client-qt.git
synced 2025-08-06 07:45:51 +02:00
calls: prevent getting stuck in fullscreen mode when a call ends
Change-Id: I2ac4a683f3857425f59483f73f8511f00158cc30
This commit is contained in:
parent
cfa10ce268
commit
8ab37ab46e
3 changed files with 15 additions and 1 deletions
|
@ -86,8 +86,10 @@ CallAdapter::onAccountChanged()
|
||||||
void
|
void
|
||||||
CallAdapter::onCallStatusChanged(const QString& accountId, const QString& callId)
|
CallAdapter::onCallStatusChanged(const QString& accountId, const QString& callId)
|
||||||
{
|
{
|
||||||
|
set_hasCall(lrcInstance_->hasActiveCall());
|
||||||
|
|
||||||
// :/ one timer for all the call overlays
|
// :/ one timer for all the call overlays
|
||||||
if (!lrcInstance_->hasActiveCall())
|
if (!hasCall_)
|
||||||
oneSecondTimer_->stop();
|
oneSecondTimer_->stop();
|
||||||
|
|
||||||
#ifdef Q_OS_LINUX
|
#ifdef Q_OS_LINUX
|
||||||
|
|
|
@ -33,6 +33,7 @@ class SystemTray;
|
||||||
class CallAdapter final : public QmlAdapterBase
|
class CallAdapter final : public QmlAdapterBase
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
QML_PROPERTY(bool, hasCall)
|
||||||
|
|
||||||
public:
|
public:
|
||||||
enum MuteStates { UNMUTED, LOCAL_MUTED, MODERATOR_MUTED, BOTH_MUTED };
|
enum MuteStates { UNMUTED, LOCAL_MUTED, MODERATOR_MUTED, BOTH_MUTED };
|
||||||
|
|
|
@ -21,6 +21,8 @@ pragma Singleton
|
||||||
|
|
||||||
import QtQuick 2.14
|
import QtQuick 2.14
|
||||||
|
|
||||||
|
import net.jami.Adapters 1.0
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
readonly property string mainViewLoadPath: "qrc:/src/mainview/MainView.qml"
|
readonly property string mainViewLoadPath: "qrc:/src/mainview/MainView.qml"
|
||||||
readonly property string wizardViewLoadPath: "qrc:/src/wizardview/WizardView.qml"
|
readonly property string wizardViewLoadPath: "qrc:/src/wizardview/WizardView.qml"
|
||||||
|
@ -29,6 +31,15 @@ Item {
|
||||||
property var mainApplicationScreen: ""
|
property var mainApplicationScreen: ""
|
||||||
property bool callIsFullscreen: false
|
property bool callIsFullscreen: false
|
||||||
|
|
||||||
|
Connections {
|
||||||
|
target: CallAdapter
|
||||||
|
|
||||||
|
function onHasCallChanged() {
|
||||||
|
if (!CallAdapter.hasCall && callIsFullscreen)
|
||||||
|
callIsFullscreen = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
TextMetrics {
|
TextMetrics {
|
||||||
id: globalTextMetrics
|
id: globalTextMetrics
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue