mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-23 21:05:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

Deallocate call notification dialog objects when closed

Browse source 
Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
This commit is contained in:
Claudio Cambra 2022-09-14 12:25:56 +02:00
parent 4fcef4edbc
commit 5a56584fba
3 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gui/systray.cpp
View file

@ -205,6 +205,12 @@ void Systray::setupContextMenu()
});
}
void Systray::destroyDialog(QQuickWindow *dialog) const
{
dialog->destroy();
dialog->deleteLater();
}
void Systray::createCallDialog(const Activity &callNotification, const AccountStatePtr accountState)
{
qCDebug(lcSystray) << "Starting a new call dialog for notification with id: " << callNotification._id << "with text: " << callNotification._subject;
@ -244,6 +250,8 @@ void Systray::createCallDialog(const Activity &callNotification, const AccountSt
return;
}
// This call dialog gets deallocated on close conditions
// by a call from the QML side to the destroyDialog slot
callDialog->createWithInitialProperties(initialProperties);
_callsAlreadyNotified.insert(callNotification._id);
}

4
src/gui/systray.h
View file

@ -118,6 +118,10 @@ public slots:
void positionWindowAtScreenCenter(QQuickWindow *window) const;
void positionNotificationWindow(QQuickWindow *window) const;
// Do not use this for QQuickWindow components managed by the QML engine,
// only for those managed by the C++ engine
void destroyDialog(QQuickWindow *window) const;
void showWindow(WindowPosition position = WindowPosition::Default);
void hideWindow();

2
src/gui/tray/CallNotificationDialog.qml
View file

@ -48,6 +48,8 @@ Window {
callStateChecker.checking = false;
ringSound.stop();
root.close();
Systray.destroyDialog(root);
}
width: root.windowWidth