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

activation: Simplify icon loading logic

Browse source
This commit is contained in:
Aleix Pol 2022-07-18 19:35:21 +02:00
parent 61b1eac5b8
commit b2aacba086
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/xdgactivationv1.cpp
View file

@ -74,7 +74,7 @@ QString XdgActivationV1Integration::requestToken(bool isPrivileged, SurfaceInter
clear(); clear();
} }
bool showNotify = false; bool showNotify = false;
QIcon icon; QIcon icon = QIcon::fromTheme(QStringLiteral("system-run"));
if (const QString desktopFilePath = Window::findDesktopFile(appId); !desktopFilePath.isEmpty()) { if (const QString desktopFilePath = Window::findDesktopFile(appId); !desktopFilePath.isEmpty()) {
KDesktopFile df(desktopFilePath); KDesktopFile df(desktopFilePath);
Window *window = Workspace::self()->activeWindow(); Window *window = Workspace::self()->activeWindow();
@ -82,11 +82,10 @@ QString XdgActivationV1Integration::requestToken(bool isPrivileged, SurfaceInter
const auto desktop = df.desktopGroup(); const auto desktop = df.desktopGroup();
showNotify = desktop.readEntry("X-KDE-StartupNotify", desktop.readEntry("StartupNotify", true)); showNotify = desktop.readEntry("X-KDE-StartupNotify", desktop.readEntry("StartupNotify", true));
} }
icon = QIcon::fromTheme(df.readIcon(), QIcon::fromTheme(QStringLiteral("system-run"))); icon = QIcon::fromTheme(df.readIcon(), icon);
} }
m_currentActivationToken.reset(new ActivationToken{newToken, isPrivileged, surface, serial, seat, appId, showNotify, waylandServer()->plasmaActivationFeedback()->createActivation(appId)}); m_currentActivationToken.reset(new ActivationToken{newToken, isPrivileged, surface, serial, seat, appId, showNotify, waylandServer()->plasmaActivationFeedback()->createActivation(appId)});
if (showNotify) { if (showNotify) {
const auto icon = QIcon::fromTheme(Window::iconFromDesktopFile(appId), QIcon::fromTheme(QStringLiteral("system-run")));
Q_EMIT effects->startupAdded(m_currentActivationToken->token, icon); Q_EMIT effects->startupAdded(m_currentActivationToken->token, icon);
} }
return newToken; return newToken;