diff --git a/iced b/iced index 1a25f50..70d104a 160000 --- a/iced +++ b/iced @@ -1 +1 @@ -Subproject commit 1a25f501d02f545f0989cf13e2bd4cac5d8d520f +Subproject commit 70d104a28a87f06eb46d76268b6fa18c407ee2c2 diff --git a/src/widget/calendar.rs b/src/widget/calendar.rs index 07d0d0b..826c46f 100644 --- a/src/widget/calendar.rs +++ b/src/widget/calendar.rs @@ -15,14 +15,14 @@ pub fn calendar( on_select: impl Fn(NaiveDate) -> M + 'static, on_prev: impl Fn() -> M + 'static, on_next: impl Fn() -> M + 'static, - first_day_of_week: Weekday + first_day_of_week: Weekday, ) -> Calendar { Calendar { model, on_select: Box::new(on_select), on_prev: Box::new(on_prev), on_next: Box::new(on_next), - first_day_of_week + first_day_of_week, } } @@ -107,7 +107,7 @@ pub struct Calendar<'a, M> { on_select: Box M>, on_prev: Box M>, on_next: Box M>, - first_day_of_week: Weekday + first_day_of_week: Weekday, } impl<'a, Message> From> for crate::Element<'a, Message> diff --git a/src/widget/spin_button.rs b/src/widget/spin_button.rs index 9a2c59d..0dba410 100644 --- a/src/widget/spin_button.rs +++ b/src/widget/spin_button.rs @@ -153,13 +153,14 @@ macro_rules! make_button { ($spin_button:expr, $icon:expr, $operation:expr) => {{ #[cfg(target_os = "linux")] let button = icon::from_name($icon); - + #[cfg(not(target_os = "linux"))] - let button = icon::from_svg_bytes( - include_bytes!(concat!["../../res/icons/", $icon ,".svg"]) - ).symbolic(true); - - button.apply(button::icon) + let button = + icon::from_svg_bytes(include_bytes!(concat!["../../res/icons/", $icon, ".svg"])) + .symbolic(true); + + button + .apply(button::icon) .on_press(($spin_button.on_press)($operation( $spin_button.value, $spin_button.step, @@ -252,4 +253,4 @@ mod tests { fn decrement() { assert_eq!(super::decrement(0i32, 10, 15, 35), 15); } -} \ No newline at end of file +} diff --git a/src/widget/warning.rs b/src/widget/warning.rs index 92fa717..3e3a1ad 100644 --- a/src/widget/warning.rs +++ b/src/widget/warning.rs @@ -40,13 +40,12 @@ impl<'a, Message: 'static + Clone> Warning<'a, Message> { .on_press_maybe(self.on_close); #[cfg(not(target_os = "linux"))] - let close_button = icon::from_svg_bytes( - include_bytes!("../../res/icons/window-close-symbolic.svg") - ) - .symbolic(true) - .apply(widget::button::icon) - .icon_size(16) - .on_press_maybe(self.on_close); + let close_button = + icon::from_svg_bytes(include_bytes!("../../res/icons/window-close-symbolic.svg")) + .symbolic(true) + .apply(widget::button::icon) + .icon_size(16) + .on_press_maybe(self.on_close); widget::row::with_capacity(2) .push(label)