x11-misc/neovide.neovide
1
0
Fork 0
mirror of https://github.com/neovide/neovide.git synced 2026-09-10 07:16:25 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: avoid overriding icon in Dock for bundled app launches

Browse source
This commit is contained in:
Yu 2026-06-23 15:04:00 +08:00
parent 618605b79d
commit bfa0562597
No known key found for this signature in database
GPG key ID: 309950646F0C4AB8
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/platform/macos/mod.rs
View file

@ -298,13 +298,22 @@ fn load_icon_from_default_bytes() -> Option<Retained<NSImage>> {
}
}
fn is_running_from_app_bundle() -> bool {
std::env::current_exe().is_ok_and(|exe| {
exe.ancestors().any(|path| path.extension().is_some_and(|extension| extension == "app"))
})
}
fn load_neovide_icon(custom_icon_path: Option<&String>) -> Option<Retained<NSImage>> {
custom_icon_path
.and_then(|path| {
if let Some(path) = custom_icon_path {
return {
let expanded = expand_tilde(path);
load_icon_from_custom_path(&expanded)
})
.or_else(load_icon_from_default_bytes)
};
}
// Bundled apps should keep the icon resolved by macOS, including user-customized icons.
(!is_running_from_app_bundle()).then(load_icon_from_default_bytes).flatten()
}
fn open_external_url(url: &str) {