starred/komorebi
1
0
Fork 0
mirror of https://github.com/LGUG2Z/komorebi.git synced 2026-07-10 23:22:43 +02:00
Code Issues 87 Packages Projects Releases 11 Wiki Activity

fix(bar): use custom windows-icons w/o panics

Browse Source 
This commit uses a custom fork of windows-icons which removes runtime
panics and instead exposes a safe Option<T> based API.
This commit is contained in:
LGUG2Z
2024-09-16 14:41:39 -07:00
parent 7005a01d9c
commit 254fcc988f
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+1 -2
View File
@@ -6115,8 +6115,7 @@ dependencies = [
[[package]] [[package]]
name = "windows-icons" name = "windows-icons"
version = "0.1.0" version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/LGUG2Z/windows-icons?rev=d67cc9920aa9b4883393e411fb4fa2ddd4c498b5#d67cc9920aa9b4883393e411fb4fa2ddd4c498b5"
checksum = "e8bbc62fa6f23804699b9559429f6f1eb761d215184e011cd365041d202e0b2e"
dependencies = [ dependencies = [
"base64", "base64",
"image", "image",
komorebi-bar/Cargo.toml
+1 -1
View File
@@ -33,4 +33,4 @@ tracing = "0.1"
tracing-appender = "0.2" tracing-appender = "0.2"
tracing-subscriber = { version = "0.3", features = ["env-filter"] } tracing-subscriber = { version = "0.3", features = ["env-filter"] }
windows = { workspace = true } windows = { workspace = true }
windows-icons = "0.1" windows-icons = { git = "https://github.com/LGUG2Z/windows-icons", rev = "d67cc9920aa9b4883393e411fb4fa2ddd4c498b5" }
komorebi-bar/src/komorebi.rs
+14 -4
View File
@@ -223,8 +223,13 @@ impl KomorebiNotificationState {
if let Ok(title) = window.title() { if let Ok(title) = window.title() {
self.focused_window_title.clone_from(&title); self.focused_window_title.clone_from(&title);
self.focused_window_pid = Some(window.process_id()); self.focused_window_pid = Some(window.process_id());
let img = windows_icons::get_icon_by_process_id(window.process_id()); if let Some(img) =
self.focused_window_icon = Some(img); windows_icons::get_icon_by_process_id(window.process_id())
{
self.focused_window_icon = Some(img);
} else {
self.focused_window_icon = None;
}
} }
} }
} else if let Some(container) = } else if let Some(container) =
@@ -234,8 +239,13 @@ impl KomorebiNotificationState {
if let Ok(title) = window.title() { if let Ok(title) = window.title() {
self.focused_window_title.clone_from(&title); self.focused_window_title.clone_from(&title);
self.focused_window_pid = Some(window.process_id()); self.focused_window_pid = Some(window.process_id());
let img = windows_icons::get_icon_by_process_id(window.process_id()); if let Some(img) =
self.focused_window_icon = Some(img); windows_icons::get_icon_by_process_id(window.process_id())
{
self.focused_window_icon = Some(img);
} else {
self.focused_window_icon = None;
}
} }
} }
} else { } else {