JakeStanger/ironbar
1
1
Fork 0
mirror of https://github.com/JakeStanger/ironbar.git synced 2024-11-27 02:54:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: fix strict clippy warnings

Browse Source
This commit is contained in:
Jake Stanger 2023-04-10 20:04:59 +01:00
parent 3d308ab572
commit c214f65ecb
No known key found for this signature in database
GPG Key ID: C51FC8F9CB0BEA61
3 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/custom/box.rs
View File

@ -21,7 +21,7 @@ impl CustomWidget for BoxWidget {
if let Some(orientation) = self.orientation {
container.set_orientation(
try_get_orientation(&orientation).unwrap_or(Orientation::Horizontal),
)
);
}
if let Some(widgets) = self.widgets {

14
src/modules/custom/mod.rs
View File

@ -109,12 +109,12 @@ impl Widget {
/// Creates this widget and adds it to the parent container
fn add_to(self, parent: &gtk::Box, context: CustomWidgetContext) {
match self {
Widget::Box(widget) => parent.add(&widget.into_widget(context)),
Widget::Label(widget) => parent.add(&widget.into_widget(context)),
Widget::Button(widget) => parent.add(&widget.into_widget(context)),
Widget::Image(widget) => parent.add(&widget.into_widget(context)),
Widget::Slider(widget) => parent.add(&widget.into_widget(context)),
Widget::Progress(widget) => parent.add(&widget.into_widget(context)),
Self::Box(widget) => parent.add(&widget.into_widget(context)),
Self::Label(widget) => parent.add(&widget.into_widget(context)),
Self::Button(widget) => parent.add(&widget.into_widget(context)),
Self::Image(widget) => parent.add(&widget.into_widget(context)),
Self::Slider(widget) => parent.add(&widget.into_widget(context)),
Self::Progress(widget) => parent.add(&widget.into_widget(context)),
}
}
}
@ -147,7 +147,7 @@ impl Module<gtk::Box> for CustomModule {
debug!("executing command: '{}'", script.cmd);
let args = event.args.unwrap_or(vec![]);
let args = event.args.unwrap_or_default();
if let Err(err) = script.get_output(Some(&args)).await {
error!("{err:?}");

13
src/modules/custom/slider.rs
View File

@ -60,7 +60,7 @@ impl CustomWidget for SliderWidget {
scale.connect_change_value(move |scale, _, val| {
// GTK will send values outside min/max range
let val = clamp(val, min, max);
let val = val.clamp(min, max);
if val != prev_value.get() {
try_send!(
@ -106,14 +106,3 @@ impl CustomWidget for SliderWidget {
scale
}
}
/// Ensures `num` is between `min` and `max` (inclusive).
fn clamp(num: f64, min: f64, max: f64) -> f64 {
if num < min {
min
} else if num > max {
max
} else {
num
}
}