Skip to content

Commit

Permalink
refactor: address requested changes (3)
Browse files Browse the repository at this point in the history
  • Loading branch information
BowDown097 committed Feb 5, 2025
1 parent d5e4e08 commit 2fd49e0
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
3 changes: 2 additions & 1 deletion src/bar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ use gtk::prelude::*;
use gtk::{Application, ApplicationWindow, IconTheme, Orientation, Window, WindowType};
use gtk_layer_shell::LayerShell;
use std::rc::Rc;
use std::sync::Arc;
use std::time::Duration;
use tracing::{debug, info};

Expand Down Expand Up @@ -268,7 +269,7 @@ impl Bar {
output_name: &self.monitor_name,
location: $location,
icon_theme: &icon_theme,
icon_overrides: &self.ironbar.config.borrow().icon_overrides,
icon_overrides: Arc::new(self.ironbar.config.borrow().icon_overrides.clone()),
}
};
}
Expand Down
3 changes: 1 addition & 2 deletions src/modules/focused.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ use color_eyre::Result;
use gtk::prelude::*;
use gtk::Label;
use serde::Deserialize;
use std::sync::Arc;
use tokio::sync::mpsc;
use tracing::debug;

Expand Down Expand Up @@ -151,7 +150,7 @@ impl Module<gtk::Box> for FocusedModule {
container.add(&label);

{
let icon_overrides = Arc::new(info.icon_overrides.clone());
let icon_overrides = info.icon_overrides.clone();
let icon_theme = info.icon_theme.clone();

glib_recv!(context.subscribe(), data => {
Expand Down
2 changes: 1 addition & 1 deletion src/modules/launcher/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ impl Module<gtk::Box> for LauncherModule {
let items = arc_mut!(items);
let items2 = Arc::clone(&items);

let icon_overrides = Arc::new(info.icon_overrides.clone());
let icon_overrides = info.icon_overrides.clone();

let tx = context.tx.clone();
let tx2 = context.tx.clone();
Expand Down
2 changes: 1 addition & 1 deletion src/modules/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ pub struct ModuleInfo<'a> {
pub monitor: &'a Monitor,
pub output_name: &'a str,
pub icon_theme: &'a IconTheme,
pub icon_overrides: &'a HashMap<String, String>,
pub icon_overrides: Arc<HashMap<String, String>>,
}

#[derive(Debug, Clone)]
Expand Down

0 comments on commit 2fd49e0

Please sign in to comment.