yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xdgactivation: do not tell effects about unknown applications

Browse source 
Makes for an odd decoration.
We generally will not have an app_id in the cases where we are creating
a token just in case it's necessary down the line.
This commit is contained in:
Aleix Pol 2021-06-17 02:01:03 +02:00 committed by Aleix Pol Gonzalez
parent 81f7436fda
commit 56915dc113
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/xdgactivationv1.cpp
View file

@ -52,8 +52,10 @@ XdgActivationV1Integration::XdgActivationV1Integration(XdgActivationV1Interface
clear();
}
m_currentActivationToken.reset(new ActivationToken{newToken, client, surface, serial, seat, appId});
const auto icon = QIcon::fromTheme(AbstractClient::iconFromDesktopFile(appId), QIcon::fromTheme(QStringLiteral("system-run")));
Q_EMIT effects->startupAdded(m_currentActivationToken->token, icon);
if (!appId.isEmpty()) {
const auto icon = QIcon::fromTheme(AbstractClient::iconFromDesktopFile(appId), QIcon::fromTheme(QStringLiteral("system-run")));
Q_EMIT effects->startupAdded(m_currentActivationToken->token, icon);
}
return newToken;
});
@ -90,7 +92,9 @@ void XdgActivationV1Integration::activateSurface(SurfaceInterface *surface, cons
void XdgActivationV1Integration::clear()
{
Q_ASSERT(m_currentActivationToken);
Q_EMIT effects->startupRemoved(m_currentActivationToken->token);
if (!m_currentActivationToken->applicationId.isEmpty()) {
Q_EMIT effects->startupRemoved(m_currentActivationToken->token);
}
m_currentActivationToken.reset();
}