Skip to content

Load tray icon directly on Linux #13478

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

Open
hifi wants to merge 1 commit into
base: develop
Choose a base branch
from
+5 −1
Open

Load tray icon directly on Linux #13478

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
6 changes: 5 additions & 1 deletion src/gui/Icons.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,11 @@ QIcon Icons::trayIcon(bool unlocked)
#elif defined(Q_OS_MACOS)
i = icon(QString("keepassxc-monochrome-light%1").arg(suffix), false);
#else
i = icon(QString("%1-%2%3").arg(applicationIconName(), iconAppearance, suffix), false);
// On Linux/Wayland, QIcon::fromTheme() returns an icon with themeName="application",
// which the compositor uses to look up the icon in the system theme (wrong icon).
// Load directly from the embedded resource to bypass QIcon::fromTheme().
i = QIcon(
QString(":/icons/application/scalable/apps/%1-%2%3.svg").arg(applicationIconName(), iconAppearance, suffix));
#endif
// Set as mask to allow the operating system to recolour the tray icon. This may look weird
// if we failed to detect the status bar background colour correctly, but it is certainly
Expand Down
Loading