Skip to content

fix(tray): harden COSMIC icon fallback #160

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
devmobasa merged 1 commit into from
Mar 16, 2026
Merged

fix(tray): harden COSMIC icon fallback #160

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
11 changes: 8 additions & 3 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,13 @@
postInstall = ''
install -Dm644 packaging/wayscriber.desktop $out/share/applications/wayscriber.desktop
install -Dm644 packaging/wayscriber.service $out/lib/systemd/user/wayscriber.service
for size in 24 64 128; do
install -Dm644 packaging/icons/wayscriber-$size.png \
$out/share/icons/hicolor/''${size}x''${size}/apps/wayscriber.png
for size in 16 19 22 24 38 64 128; do
for category in apps status; do
install -Dm644 packaging/icons/wayscriber-$size.png \
$out/share/icons/hicolor/''${size}x''${size}/''${category}/wayscriber.png
done
done
install -Dm644 packaging/icons/wayscriber-128.png $out/share/pixmaps/wayscriber.png
install -Dm644 config.example.toml $out/share/doc/wayscriber/config.example.toml
install -Dm644 README.md $out/share/doc/wayscriber/README.md
install -Dm644 LICENSE $out/share/licenses/wayscriber/LICENSE
Expand Down Expand Up @@ -77,6 +80,8 @@
install -Dm644 packaging/icons/wayscriber-configurator-$size.png \
$out/share/icons/hicolor/''${size}x''${size}/apps/wayscriber-configurator.png
done
install -Dm644 packaging/icons/wayscriber-configurator-128.png \
$out/share/pixmaps/wayscriber-configurator.png
install -Dm644 README.md $out/share/doc/wayscriber-configurator/README.md
install -Dm644 LICENSE $out/share/licenses/wayscriber-configurator/LICENSE

Expand Down
3 changes: 3 additions & 0 deletions packaging/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,16 @@ package() {
install -Dm644 "$srcdir/wayscriber-24.png" "$pkgdir/usr/share/icons/hicolor/24x24/status/wayscriber.png"
install -Dm644 "$srcdir/wayscriber-38.png" "$pkgdir/usr/share/icons/hicolor/38x38/status/wayscriber.png"
install -Dm644 "$srcdir/wayscriber-64.png" "$pkgdir/usr/share/icons/hicolor/64x64/status/wayscriber.png"
install -Dm644 "$srcdir/wayscriber-128.png" "$pkgdir/usr/share/icons/hicolor/128x128/status/wayscriber.png"
install -Dm644 "$srcdir/wayscriber-128.png" "$pkgdir/usr/share/pixmaps/wayscriber.png"
install -Dm644 "$srcdir/wayscriber-configurator-16.png" "$pkgdir/usr/share/icons/hicolor/16x16/apps/wayscriber-configurator.png"
install -Dm644 "$srcdir/wayscriber-configurator-19.png" "$pkgdir/usr/share/icons/hicolor/19x19/apps/wayscriber-configurator.png"
install -Dm644 "$srcdir/wayscriber-configurator-22.png" "$pkgdir/usr/share/icons/hicolor/22x22/apps/wayscriber-configurator.png"
install -Dm644 "$srcdir/wayscriber-configurator-24.png" "$pkgdir/usr/share/icons/hicolor/24x24/apps/wayscriber-configurator.png"
install -Dm644 "$srcdir/wayscriber-configurator-38.png" "$pkgdir/usr/share/icons/hicolor/38x38/apps/wayscriber-configurator.png"
install -Dm644 "$srcdir/wayscriber-configurator-64.png" "$pkgdir/usr/share/icons/hicolor/64x64/apps/wayscriber-configurator.png"
install -Dm644 "$srcdir/wayscriber-configurator-128.png" "$pkgdir/usr/share/icons/hicolor/128x128/apps/wayscriber-configurator.png"
install -Dm644 "$srcdir/wayscriber-configurator-128.png" "$pkgdir/usr/share/pixmaps/wayscriber-configurator.png"

# Install documentation and example config
install -Dm644 config.example.toml "$pkgdir/usr/share/doc/$pkgname/config.example.toml"
Expand Down
4 changes: 4 additions & 0 deletions packaging/package.configurator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ contents:
dst: /usr/share/icons/hicolor/128x128/apps/wayscriber-configurator.png
file_info:
mode: 0644
- src: packaging/icons/wayscriber-configurator-128.png
dst: /usr/share/pixmaps/wayscriber-configurator.png
file_info:
mode: 0644
- src: README.md
dst: /usr/share/doc/wayscriber-configurator/README.md
file_info:
Expand Down
8 changes: 8 additions & 0 deletions packaging/package.wayscriber.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,14 @@ contents:
dst: /usr/share/icons/hicolor/64x64/status/wayscriber.png
file_info:
mode: 0644
- src: packaging/icons/wayscriber-128.png
dst: /usr/share/icons/hicolor/128x128/status/wayscriber.png
file_info:
mode: 0644
- src: packaging/icons/wayscriber-128.png
dst: /usr/share/pixmaps/wayscriber.png
file_info:
mode: 0644
- src: config.example.toml
dst: /usr/share/doc/wayscriber/config.example.toml
file_info:
Expand Down
56 changes: 49 additions & 7 deletions src/daemon/tray/ksni.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ use log::{info, warn};
#[cfg(feature = "tray")]
use std::env;
#[cfg(feature = "tray")]
use std::path::PathBuf;
#[cfg(feature = "tray")]
use std::sync::atomic::Ordering;
#[cfg(feature = "tray")]
use std::time::{Duration, Instant};
Expand Down Expand Up @@ -283,12 +285,7 @@ fn tray_theme_icons_enabled() -> bool {
let desktop_session = env::var("DESKTOP_SESSION")
.unwrap_or_default()
.to_lowercase();
!(desktop_env.contains("noctalia")
|| session_env.contains("noctalia")
|| desktop_session.contains("noctalia")
|| desktop_env.contains("quickshell")
|| session_env.contains("quickshell")
|| desktop_session.contains("quickshell"))
tray_theme_icons_supported(&desktop_env, &session_env, &desktop_session)
}

#[cfg(feature = "tray")]
Expand All @@ -305,7 +302,29 @@ fn resolve_icon_theme_path() -> String {
if let Ok(value) = env::var("WAYSCRIBER_ICON_THEME_PATH") {
return value;
}
String::new()
installed_icon_theme_path()
.map(|path| path.to_string_lossy().into_owned())
.unwrap_or_default()
}

#[cfg(feature = "tray")]
fn tray_theme_icons_supported(desktop_env: &str, session_env: &str, desktop_session: &str) -> bool {
!tray_theme_icons_blocked_by_desktop(desktop_env)
&& !tray_theme_icons_blocked_by_desktop(session_env)
&& !tray_theme_icons_blocked_by_desktop(desktop_session)
}

#[cfg(feature = "tray")]
fn tray_theme_icons_blocked_by_desktop(value: &str) -> bool {
value.contains("noctalia") || value.contains("quickshell") || value.contains("cosmic")
}

#[cfg(feature = "tray")]
fn installed_icon_theme_path() -> Option<PathBuf> {
let exe_path = env::current_exe().ok()?;
let install_root = exe_path.parent()?.parent()?;
let icon_theme_path = install_root.join("share/icons");
icon_theme_path.is_dir().then_some(icon_theme_path)
}

#[cfg(feature = "tray")]
Expand All @@ -316,3 +335,26 @@ fn toggle_overlay_menu_label() -> String {
None => base.to_string(),
}
}

#[cfg(all(feature = "tray", test))]
mod tests {
use super::tray_theme_icons_supported;

#[test]
fn tray_theme_icons_supported_allows_common_desktops() {
assert!(tray_theme_icons_supported("kde", "plasma", "plasmashell"));
}

#[test]
fn tray_theme_icons_supported_blocks_cosmic() {
assert!(!tray_theme_icons_supported("cosmic", "", ""));
assert!(!tray_theme_icons_supported("", "cosmic", ""));
assert!(!tray_theme_icons_supported("", "", "cosmic-session"));
}

#[test]
fn tray_theme_icons_supported_blocks_existing_problem_shells() {
assert!(!tray_theme_icons_supported("quickshell", "", ""));
assert!(!tray_theme_icons_supported("", "noctalia", ""));
}
}
25 changes: 17 additions & 8 deletions tools/package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,17 +109,24 @@ package_tar() {
mkdir -p "${dist_dir}/usr/bin" \
"${dist_dir}/usr/lib/systemd/user" \
"${dist_dir}/usr/share/applications" \
"${dist_dir}/usr/share/icons/hicolor/24x24/apps" \
"${dist_dir}/usr/share/icons/hicolor/64x64/apps" \
"${dist_dir}/usr/share/icons/hicolor/128x128/apps" \
"${dist_dir}/usr/share/doc/wayscriber"
"${dist_dir}/usr/share/doc/wayscriber" \
"${dist_dir}/usr/share/pixmaps"

for size in 16 19 22 24 38 64 128; do
mkdir -p "${dist_dir}/usr/share/icons/hicolor/${size}x${size}/apps" \
"${dist_dir}/usr/share/icons/hicolor/${size}x${size}/status"
done

cp "${REPO_ROOT}/target/release/wayscriber" "${dist_dir}/usr/bin/"
cp "${REPO_ROOT}/packaging/wayscriber.service" "${dist_dir}/usr/lib/systemd/user/"
cp "${REPO_ROOT}/packaging/wayscriber.desktop" "${dist_dir}/usr/share/applications/"
cp "${REPO_ROOT}/packaging/icons/wayscriber-24.png" "${dist_dir}/usr/share/icons/hicolor/24x24/apps/wayscriber.png"
cp "${REPO_ROOT}/packaging/icons/wayscriber-64.png" "${dist_dir}/usr/share/icons/hicolor/64x64/apps/wayscriber.png"
cp "${REPO_ROOT}/packaging/icons/wayscriber-128.png" "${dist_dir}/usr/share/icons/hicolor/128x128/apps/wayscriber.png"
for size in 16 19 22 24 38 64 128; do
cp "${REPO_ROOT}/packaging/icons/wayscriber-${size}.png" \
"${dist_dir}/usr/share/icons/hicolor/${size}x${size}/apps/wayscriber.png"
cp "${REPO_ROOT}/packaging/icons/wayscriber-${size}.png" \
"${dist_dir}/usr/share/icons/hicolor/${size}x${size}/status/wayscriber.png"
done
cp "${REPO_ROOT}/packaging/icons/wayscriber-128.png" "${dist_dir}/usr/share/pixmaps/wayscriber.png"
cp "${REPO_ROOT}/README.md" "${REPO_ROOT}/config.example.toml" "${dist_dir}/usr/share/doc/wayscriber/"
[[ -f "${REPO_ROOT}/LICENSE" ]] && cp "${REPO_ROOT}/LICENSE" "${dist_dir}/usr/share/doc/wayscriber/" || true

Expand All @@ -143,13 +150,15 @@ package_tar_configurator() {
"${dist_dir}/usr/share/icons/hicolor/24x24/apps" \
"${dist_dir}/usr/share/icons/hicolor/64x64/apps" \
"${dist_dir}/usr/share/icons/hicolor/128x128/apps" \
"${dist_dir}/usr/share/doc/wayscriber-configurator"
"${dist_dir}/usr/share/doc/wayscriber-configurator" \
"${dist_dir}/usr/share/pixmaps"

cp "${REPO_ROOT}/target/release/wayscriber-configurator" "${dist_dir}/usr/bin/"
cp "${REPO_ROOT}/packaging/wayscriber-configurator.desktop" "${dist_dir}/usr/share/applications/"
cp "${REPO_ROOT}/packaging/icons/wayscriber-configurator-24.png" "${dist_dir}/usr/share/icons/hicolor/24x24/apps/wayscriber-configurator.png"
cp "${REPO_ROOT}/packaging/icons/wayscriber-configurator-64.png" "${dist_dir}/usr/share/icons/hicolor/64x64/apps/wayscriber-configurator.png"
cp "${REPO_ROOT}/packaging/icons/wayscriber-configurator-128.png" "${dist_dir}/usr/share/icons/hicolor/128x128/apps/wayscriber-configurator.png"
cp "${REPO_ROOT}/packaging/icons/wayscriber-configurator-128.png" "${dist_dir}/usr/share/pixmaps/wayscriber-configurator.png"
cp "${REPO_ROOT}/README.md" "${dist_dir}/usr/share/doc/wayscriber-configurator/"
[[ -f "${REPO_ROOT}/LICENSE" ]] && cp "${REPO_ROOT}/LICENSE" "${dist_dir}/usr/share/doc/wayscriber-configurator/" || true

Expand Down
Loading