strangechoice/ironbar-fork
1
0
Fork 0
Code Pull Requests Activity

refactor: use macro for module config matching

Browse Source
This commit is contained in:
Jake Stanger
2022-08-14 23:32:20 +01:00
parent ebf7a97a85
commit de80b99e64
1 changed files with 16 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/bar.rs
View File

@@ -85,48 +85,24 @@ fn load_modules(
} }
fn add_modules(content: &gtk::Box, modules: Vec<ModuleConfig>, info: ModuleInfo) { fn add_modules(content: &gtk::Box, modules: Vec<ModuleConfig>, info: ModuleInfo) {
macro_rules! add_module {
($module:expr, $name:literal) => {{
let widget = $module.into_widget(&info);
widget.set_widget_name($name);
content.add(&widget);
}};
}
for config in modules { for config in modules {
match config { match config {
ModuleConfig::Clock(module) => { ModuleConfig::Clock(module) => add_module!(module, "clock"),
let widget = module.into_widget(&info); ModuleConfig::Mpd(module) => add_module!(module, "mpd"),
widget.set_widget_name("clock"); ModuleConfig::Tray(module) => add_module!(module, "tray"),
content.add(&widget); ModuleConfig::Workspaces(module) => add_module!(module, "workspaces"),
} ModuleConfig::SysInfo(module) => add_module!(module, "sysinfo"),
ModuleConfig::Mpd(module) => { ModuleConfig::Launcher(module) => add_module!(module, "launcher"),
let widget = module.into_widget(&info); ModuleConfig::Script(module) => add_module!(module, "script"),
widget.set_widget_name("mpd"); ModuleConfig::Focused(module) => add_module!(module, "focused"),
content.add(&widget);
}
ModuleConfig::Tray(module) => {
let widget = module.into_widget(&info);
widget.set_widget_name("tray");
content.add(&widget);
}
ModuleConfig::Workspaces(module) => {
let widget = module.into_widget(&info);
widget.set_widget_name("workspaces");
content.add(&widget);
}
ModuleConfig::SysInfo(module) => {
let widget = module.into_widget(&info);
widget.set_widget_name("sysinfo");
content.add(&widget);
}
ModuleConfig::Launcher(module) => {
let widget = module.into_widget(&info);
widget.set_widget_name("launcher");
content.add(&widget);
}
ModuleConfig::Script(module) => {
let widget = module.into_widget(&info);
widget.set_widget_name("script");
content.add(&widget);
}
ModuleConfig::Focused(module) => {
let widget = module.into_widget(&info);
widget.set_widget_name("focused");
content.add(&widget);
}
} }
} }
} }