Skip to content

fix(notification): fix action buttons in notification center #1785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Oct 28, 2026
+15 −6
Merged

fix(notification): fix action buttons in notification center #1785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions panels/notification/server/notificationmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,10 @@ void NotificationManager::actionInvoked(qint64 id, uint bubbleId, const QString
Q_EMIT ActionInvoked(bubbleId, actionKey);
Q_EMIT NotificationClosed(bubbleId, NotifyEntity::Closed);
} else {
// For non-extended actions, emit ActivationToken first if available
auto *activation = new DS_NAMESPACE::XdgActivation(this);
// For non-extended actions, emit ActivationToken first if available.
// The activation must not be parented to the worker-thread manager;
// the tokenReady handler below deletes it when the token arrives.
auto *activation = new DS_NAMESPACE::XdgActivation();
connect(
activation,
&DS_NAMESPACE::XdgActivation::tokenReady,
Expand Down Expand Up @@ -561,8 +563,10 @@ void NotificationManager::doActionInvoked(const NotifyEntity &entity, const QStr
amArgs << "--" << args;
}

// Get activation token, then start process
auto *activation = new DS_NAMESPACE::XdgActivation(this);
// Get activation token, then start process. It must not be
// parented to the worker-thread manager; the tokenReady
// handler below deletes it when the token arrives.
auto *activation = new DS_NAMESPACE::XdgActivation();
auto amArgsCopy = amArgs;
connect(activation, &DS_NAMESPACE::XdgActivation::tokenReady, this,
[amArgsCopy, activation](const QString &token) {
Expand Down
9 changes: 7 additions & 2 deletions panels/notification/server/notifyserverapplet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,18 @@ bool NotifyServerApplet::init()

void NotifyServerApplet::actionInvoked(qint64 id, uint bubbleId, const QString &actionKey)
{
QMetaObject::invokeMethod(m_manager, "actionInvoked", Qt::QueuedConnection,
// Keep the action synchronous with the notification center's remove()
// call. The center invokes the action and then deletes the notification,
// so the action has to reach the manager before that deletion. This was
// the behavior before the expire rework switched these calls to queued
// connections; the synchronous blocking is small and intentional.
QMetaObject::invokeMethod(m_manager, "actionInvoked", Qt::DirectConnection,
Q_ARG(qint64, id), Q_ARG(uint, bubbleId), Q_ARG(QString, actionKey));
}

void NotifyServerApplet::actionInvoked(qint64 id, const QString &actionKey)
{
QMetaObject::invokeMethod(m_manager, "actionInvoked", Qt::QueuedConnection,
QMetaObject::invokeMethod(m_manager, "actionInvoked", Qt::DirectConnection,
Q_ARG(qint64, id), Q_ARG(QString, actionKey));
}

Expand Down
Loading