zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-07-01 10:41:03 +02:00
Code Activity

refactor: clippy & fmt

Browse source
This commit is contained in:
Jake Stanger 2022-11-05 17:32:42 +00:00
parent ad77dc4e4c
commit bc625b929b
No known key found for this signature in database
GPG key ID: C51FC8F9CB0BEA61
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main.rs
View file

@ -95,10 +95,8 @@ async fn main() -> Result<()> {
debug!("Created bars"); debug!("Created bars");
let style_path = env::var("IRONBAR_CSS") let style_path = env::var("IRONBAR_CSS").ok().map_or_else(
.ok() || {
.map(PathBuf::from)
.unwrap_or_else(|| {
config_dir().map_or_else( config_dir().map_or_else(
|| { || {
let report = Report::msg("Failed to locate user config dir"); let report = Report::msg("Failed to locate user config dir");
@ -107,7 +105,9 @@ async fn main() -> Result<()> {
}, },
|dir| dir.join("ironbar").join("style.css"), |dir| dir.join("ironbar").join("style.css"),
) )
}); },
PathBuf::from,
);
if style_path.exists() { if style_path.exists() {
load_css(style_path); load_css(style_path);

16
src/modules/custom.rs
View file

@ -20,7 +20,7 @@ pub struct CustomModule {
} }
/// Attempts to parse an `Orientation` from `String` /// Attempts to parse an `Orientation` from `String`
fn try_get_orientation(orientation: String) -> Result<Orientation> { fn try_get_orientation(orientation: &str) -> Result<Orientation> {
match orientation.to_lowercase().as_str() { match orientation.to_lowercase().as_str() {
"horizontal" | "h" => Ok(Orientation::Horizontal), "horizontal" | "h" => Ok(Orientation::Horizontal),
"vertical" | "v" => Ok(Orientation::Vertical), "vertical" | "v" => Ok(Orientation::Vertical),
@ -55,14 +55,14 @@ impl Widget {
/// Creates this widget and adds it to the parent container /// Creates this widget and adds it to the parent container
fn add_to(self, parent: &gtk::Box, tx: Sender<ExecEvent>, bar_orientation: Orientation) { fn add_to(self, parent: &gtk::Box, tx: Sender<ExecEvent>, bar_orientation: Orientation) {
match self.widget_type { match self.widget_type {
WidgetType::Box => parent.add(&self.into_box(tx, bar_orientation)), WidgetType::Box => parent.add(&self.into_box(&tx, bar_orientation)),
WidgetType::Label => parent.add(&self.into_label()), WidgetType::Label => parent.add(&self.into_label()),
WidgetType::Button => parent.add(&self.into_button(tx, bar_orientation)), WidgetType::Button => parent.add(&self.into_button(tx, bar_orientation)),
} }
} }
/// Creates a `gtk::Box` from this widget /// Creates a `gtk::Box` from this widget
fn into_box(self, tx: Sender<ExecEvent>, bar_orientation: Orientation) -> gtk::Box { fn into_box(self, tx: &Sender<ExecEvent>, bar_orientation: Orientation) -> gtk::Box {
let mut builder = gtk::Box::builder(); let mut builder = gtk::Box::builder();
if let Some(name) = self.name { if let Some(name) = self.name {
@ -71,7 +71,7 @@ impl Widget {
if let Some(orientation) = self.orientation { if let Some(orientation) = self.orientation {
builder = builder builder = builder
.orientation(try_get_orientation(orientation).unwrap_or(Orientation::Horizontal)); .orientation(try_get_orientation(&orientation).unwrap_or(Orientation::Horizontal));
} }
let container = builder.build(); let container = builder.build();
@ -83,7 +83,7 @@ impl Widget {
if let Some(widgets) = self.widgets { if let Some(widgets) = self.widgets {
widgets widgets
.into_iter() .into_iter()
.for_each(|widget| widget.add_to(&container, tx.clone(), bar_orientation)) .for_each(|widget| widget.add_to(&container, tx.clone(), bar_orientation));
} }
container container
@ -198,11 +198,11 @@ impl Module<gtk::Box> for CustomModule {
let container = gtk::Box::builder().orientation(orientation).build(); let container = gtk::Box::builder().orientation(orientation).build();
if let Some(ref class) = self.class { if let Some(ref class) = self.class {
container.style_context().add_class(class) container.style_context().add_class(class);
} }
self.bar.clone().into_iter().for_each(|widget| { self.bar.clone().into_iter().for_each(|widget| {
widget.add_to(&container, context.controller_tx.clone(), orientation) widget.add_to(&container, context.controller_tx.clone(), orientation);
}); });
let popup = self.into_popup(context.controller_tx, context.popup_rx); let popup = self.into_popup(context.controller_tx, context.popup_rx);
@ -226,7 +226,7 @@ impl Module<gtk::Box> for CustomModule {
if let Some(class) = self.class { if let Some(class) = self.class {
container container
.style_context() .style_context()
.add_class(format!("popup-{class}").as_str()) .add_class(format!("popup-{class}").as_str());
} }
if let Some(popup) = self.popup { if let Some(popup) = self.popup {