leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: update iced

Browse source
This commit is contained in:
Ashley Wulber 2025-05-19 13:06:09 -04:00 • committed by GitHub
parent b7aed0e4d6
commit 2a1af3a24f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
iced

@ -1 +1 @@
Subproject commit 1a25f501d02f545f0989cf13e2bd4cac5d8d520f Subproject commit 70d104a28a87f06eb46d76268b6fa18c407ee2c2

6
src/widget/calendar.rs
View file

@ -15,14 +15,14 @@ pub fn calendar<M>(
on_select: impl Fn(NaiveDate) -> M + 'static, on_select: impl Fn(NaiveDate) -> M + 'static,
on_prev: impl Fn() -> M + 'static, on_prev: impl Fn() -> M + 'static,
on_next: impl Fn() -> M + 'static, on_next: impl Fn() -> M + 'static,
first_day_of_week: Weekday first_day_of_week: Weekday,
) -> Calendar<M> { ) -> Calendar<M> {
Calendar { Calendar {
model, model,
on_select: Box::new(on_select), on_select: Box::new(on_select),
on_prev: Box::new(on_prev), on_prev: Box::new(on_prev),
on_next: Box::new(on_next), 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<dyn Fn(NaiveDate) -> M>, on_select: Box<dyn Fn(NaiveDate) -> M>,
on_prev: Box<dyn Fn() -> M>, on_prev: Box<dyn Fn() -> M>,
on_next: Box<dyn Fn() -> M>, on_next: Box<dyn Fn() -> M>,
first_day_of_week: Weekday first_day_of_week: Weekday,
} }
impl<'a, Message> From<Calendar<'a, Message>> for crate::Element<'a, Message> impl<'a, Message> From<Calendar<'a, Message>> for crate::Element<'a, Message>

15
src/widget/spin_button.rs
View file

@ -153,13 +153,14 @@ macro_rules! make_button {
($spin_button:expr, $icon:expr, $operation:expr) => {{ ($spin_button:expr, $icon:expr, $operation:expr) => {{
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
let button = icon::from_name($icon); let button = icon::from_name($icon);
#[cfg(not(target_os = "linux"))] #[cfg(not(target_os = "linux"))]
let button = icon::from_svg_bytes( let button =
include_bytes!(concat!["../../res/icons/", $icon ,".svg"]) icon::from_svg_bytes(include_bytes!(concat!["../../res/icons/", $icon, ".svg"]))
).symbolic(true); .symbolic(true);
button.apply(button::icon) button
.apply(button::icon)
.on_press(($spin_button.on_press)($operation( .on_press(($spin_button.on_press)($operation(
$spin_button.value, $spin_button.value,
$spin_button.step, $spin_button.step,
@ -252,4 +253,4 @@ mod tests {
fn decrement() { fn decrement() {
assert_eq!(super::decrement(0i32, 10, 15, 35), 15); assert_eq!(super::decrement(0i32, 10, 15, 35), 15);
} }
} }

13
src/widget/warning.rs
View file

@ -40,13 +40,12 @@ impl<'a, Message: 'static + Clone> Warning<'a, Message> {
.on_press_maybe(self.on_close); .on_press_maybe(self.on_close);
#[cfg(not(target_os = "linux"))] #[cfg(not(target_os = "linux"))]
let close_button = icon::from_svg_bytes( let close_button =
include_bytes!("../../res/icons/window-close-symbolic.svg") icon::from_svg_bytes(include_bytes!("../../res/icons/window-close-symbolic.svg"))
) .symbolic(true)
.symbolic(true) .apply(widget::button::icon)
.apply(widget::button::icon) .icon_size(16)
.icon_size(16) .on_press_maybe(self.on_close);
.on_press_maybe(self.on_close);
widget::row::with_capacity(2) widget::row::with_capacity(2)
.push(label) .push(label)