zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-08-18 15:21:03 +02:00
Code Activity

refactor: update to rust 2024, fix strict clippy warnings

Browse source
This commit is contained in:
Jake Stanger 2025-02-21 16:35:54 +00:00
parent 79c917857c
commit 202c19efd4
No known key found for this signature in database
GPG key ID: C51FC8F9CB0BEA61
57 changed files with 132 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/launcher/item.rs
View file

@ -3,8 +3,8 @@ use crate::clients::wayland::ToplevelInfo;
use crate::config::{BarPosition, TruncateMode};
use crate::gtk_helpers::{IronbarGtkExt, IronbarLabelExt};
use crate::image::ImageProvider;
use crate::modules::launcher::{ItemEvent, LauncherUpdate};
use crate::modules::ModuleUpdateEvent;
use crate::modules::launcher::{ItemEvent, LauncherUpdate};
use crate::{read_lock, try_send};
use glib::Propagation;
use gtk::gdk::{BUTTON_MIDDLE, BUTTON_PRIMARY};

23
src/modules/launcher/mod.rs
View file

@ -221,7 +221,7 @@ impl Module<gtk::Box> for LauncherModule {
let icon_override = info
.icon_overrides
.get(app_id)
.map_or_else(String::new, |v| v.to_string());
.map_or_else(String::new, ToString::to_string);
(
app_id.to_string(),
@ -250,19 +250,16 @@ impl Module<gtk::Box> for LauncherModule {
for info in handles {
let mut items = lock!(items);
let item = items.get_mut(&info.app_id);
match item {
Some(item) => {
item.merge_toplevel(info.clone());
}
None => {
let mut item = Item::from(info.clone());
if let Some(item) = item {
item.merge_toplevel(info.clone());
} else {
let mut item = Item::from(info.clone());
if let Some(icon) = icon_overrides.get(&info.app_id) {
item.icon_override = icon.clone();
}
items.insert(info.app_id.clone(), item);
if let Some(icon) = icon_overrides.get(&info.app_id) {
item.icon_override.clone_from(icon);
}
items.insert(info.app_id.clone(), item);
}
}
@ -294,7 +291,7 @@ impl Module<gtk::Box> for LauncherModule {
let mut item: Item = info.into();
if let Some(icon) = icon_overrides.get(&app_id) {
item.icon_override = icon.clone();
item.icon_override.clone_from(icon);
}
items.insert(app_id.clone(), item.clone());