mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-04-17 20:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add debug for disappearing notification on Windows

Browse source
This commit is contained in:
Gaelle Braud 2026-02-26 14:36:24 +01:00
parent fbb9f7bc63
commit bf0c036360
3 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Linphone/core/notifier/Notifier.cpp
View file

@ -129,6 +129,7 @@ Notifier::~Notifier() {
bool Notifier::createNotification(Notifier::NotificationType type, QVariantMap data) {
mMutex->lock();
lInfo() << log().arg("Create notification") << type;
// Q_ASSERT(mInstancesNumber <= MaxNotificationsNumber);
if (mInstancesNumber >= MaxNotificationsNumber) { // Check existing instances.
qWarning() << QStringLiteral("Unable to create another notification.");
@ -161,10 +162,11 @@ bool Notifier::createNotification(Notifier::NotificationType type, QVariantMap d
engine, &QQmlApplicationEngine::objectCreated, this,
[this, url, screen, engine, type, data](QObject *obj, const QUrl &objUrl) {
if (!obj && url == objUrl) {
lCritical() << "[App] Notifier.qml couldn't be load.";
lCritical() << log().arg("%1 couldn't be load.").arg(url.toString());
engine->deleteLater();
exit(-1);
} else {
lInfo() << log().arg("Load %1").arg(url.toString());
auto window = qobject_cast<QQuickWindow *>(obj);
if (window) {
window->setProperty(NotificationPropertyData, data);
@ -187,9 +189,25 @@ bool Notifier::createNotification(Notifier::NotificationType type, QVariantMap d
screen ? mScreenHeightOffset.take(screen->name()) : 0; // Access optimization
mScreenHeightOffset.insert(screen->name(), screenHeightOffset + window->height());
QObject::connect(window, &QQuickWindow::closing, window, [this, window] {
qDebug() << "closing notification";
lInfo() << log().arg("Closing notification");
deleteNotification(QVariant::fromValue(window));
});
QObject::connect(window, &QQuickWindow::visibleChanged, window, [this](bool visible) {
lInfo() << log().arg("Notification visible changed") << visible;
});
QObject::connect(window, &QQuickWindow::activeChanged, window, [this, window] {
lInfo() << log().arg("Notification active changed") << window->isActive();
});
QObject::connect(window, &QQuickWindow::visibilityChanged, window,
[this](QWindow::Visibility visibility) {
lInfo() << log().arg("Notification visibility changed") << visibility;
});
QObject::connect(window, &QQuickWindow::widthChanged, window, [this](int width) {
lInfo() << log().arg("Notification width changed") << width;
});
QObject::connect(window, &QQuickWindow::heightChanged, window, [this](int height) {
lInfo() << log().arg("Notification height changed") << height;
});
showNotification(window, timeout);
lInfo() << QStringLiteral("Create notification:") << QVariant::fromValue(window);
}
@ -209,6 +227,7 @@ bool Notifier::createNotification(Notifier::NotificationType type, QVariantMap d
void Notifier::showNotification(QQuickWindow *notification, int timeout) {
// Display notification.
lInfo() << log().arg("Show notification");
QTimer *timer = new QTimer(notification);
timer->setInterval(timeout);
timer->setSingleShot(true);
@ -218,12 +237,10 @@ void Notifier::showNotification(QQuickWindow *notification, int timeout) {
lInfo() << log().arg("Windows : screen unlocked, force raising notification");
notification->show();
notification->raise();
notification->requestActivate();
});
#endif
notification->show();
notification->raise();
notification->requestActivate();
// Destroy it after timeout.
QObject::connect(timer, &QTimer::timeout, this,
@ -258,7 +275,7 @@ void Notifier::deleteNotification(QVariant notification) {
return;
}
lInfo() << QStringLiteral("Delete notification:") << instance << --mInstancesNumber;
lInfo() << log().arg("Delete notification:") << instance << --mInstancesNumber;
instance->setProperty("__valid", true);
auto timerProperty = instance->property(NotificationPropertyTimer).value<QTimer *>();

5
Linphone/view/Control/Popup/DesktopPopup.qml
View file

@ -40,11 +40,12 @@ Window {
property bool showAsTool : false
// Don't use Popup for flags : it could lead to error in geometry. On Mac, Using Tool ensure to have the Window on Top and fullscreen independant
// flags: Qt.WindowDoesNotAcceptFocus | Qt.BypassWindowManagerHint | (showAsTool?Qt.Tool:Qt.WindowStaysOnTopHint) | Qt.Window | Qt.FramelessWindowHint;
flags: Qt.SplashScreen | Qt.WindowDoesNotAcceptFocus | Qt.FramelessWindowHint // | Qt.WindowStaysOnTopHint
flags: Qt.SplashScreen | Qt.WindowDoesNotAcceptFocus | Qt.WindowStaysOnTopHint //| Qt.FramelessWindowHint
opacity: 1.0
height: _content[0] != null ? _content[0].height : 0
width: _content[0] != null ? _content[0].width : 0
visible:true
visible: true
Item {
id: content
anchors.fill:parent

5
Linphone/view/Control/Popup/Notification/Notification.qml
View file

@ -17,7 +17,6 @@ DesktopPopup {
property double radius: 0
property color backgroundColor: DefaultStyle.grey_0
property double backgroundOpacity: 1
default property alias _content: content.data
signal deleteNotification (var notification)
width: mainItem.overriddenWidth
@ -70,8 +69,4 @@ DesktopPopup {
}
}
}
Item {
id: content
anchors.fill: parent
}
}