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

chore: update iced (#1029)

Browse source
This commit is contained in:
Ashley Wulber 2025-10-27 11:24:02 -04:00 • committed by GitHub
parent 6204784f20
commit 0c6c85429e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
iced

@ -1 +1 @@
Subproject commit cfe5f4b1a4413b9c94c10832093b2a9e0de5eece Subproject commit 783d764cabd6eee020eeae3b50a0d4727a721056

36
src/widget/calendar.rs
View file

@ -5,11 +5,11 @@
use std::cmp; use std::cmp;
use crate::fl;
use crate::iced_core::{Alignment, Length, Padding}; use crate::iced_core::{Alignment, Length, Padding};
use crate::widget::{Grid, button, column, grid, icon, row, text}; use crate::widget::{Grid, button, column, grid, icon, row, text};
use apply::Apply; use apply::Apply;
use chrono::{Datelike, Days, Local, Month, Months, NaiveDate, Weekday}; use chrono::{Datelike, Days, Local, Month, Months, NaiveDate, Weekday};
use crate::fl;
/// A widget that displays an interactive calendar. /// A widget that displays an interactive calendar.
pub fn calendar<M>( pub fn calendar<M>(
@ -133,20 +133,20 @@ where
macro_rules! translate_month { macro_rules! translate_month {
($month:expr, $year:expr) => {{ ($month:expr, $year:expr) => {{
match $month { match $month {
chrono::Month::January => fl!("january", year=$year), chrono::Month::January => fl!("january", year = $year),
chrono::Month::February => fl!("february", year=$year), chrono::Month::February => fl!("february", year = $year),
chrono::Month::March => fl!("march", year=$year), chrono::Month::March => fl!("march", year = $year),
chrono::Month::April => fl!("april", year=$year), chrono::Month::April => fl!("april", year = $year),
chrono::Month::May => fl!("may", year=$year), chrono::Month::May => fl!("may", year = $year),
chrono::Month::June => fl!("june", year=$year), chrono::Month::June => fl!("june", year = $year),
chrono::Month::July => fl!("july", year=$year), chrono::Month::July => fl!("july", year = $year),
chrono::Month::August => fl!("august", year=$year), chrono::Month::August => fl!("august", year = $year),
chrono::Month::September => fl!("september", year=$year), chrono::Month::September => fl!("september", year = $year),
chrono::Month::October => fl!("october", year=$year), chrono::Month::October => fl!("october", year = $year),
chrono::Month::November => fl!("november", year=$year), chrono::Month::November => fl!("november", year = $year),
chrono::Month::December => fl!("december", year=$year) chrono::Month::December => fl!("december", year = $year),
} }
}} }};
} }
macro_rules! translate_weekday { macro_rules! translate_weekday {
($weekday:expr) => {{ ($weekday:expr) => {{
@ -157,15 +157,17 @@ where
Weekday::Thu => fl!("thursday"), Weekday::Thu => fl!("thursday"),
Weekday::Fri => fl!("friday"), Weekday::Fri => fl!("friday"),
Weekday::Sat => fl!("saturday"), Weekday::Sat => fl!("saturday"),
Weekday::Sun => fl!("sunday") Weekday::Sun => fl!("sunday"),
} }
}} }};
} }
let date = text(translate_month!( let date = text(translate_month!(
Month::try_from(this.model.visible.month() as u8) Month::try_from(this.model.visible.month() as u8)
.expect("Previously valid month is suddenly invalid"), .expect("Previously valid month is suddenly invalid"),
this.model.visible.year())).size(18); this.model.visible.year()
))
.size(18);
let month_controls = row::with_capacity(2) let month_controls = row::with_capacity(2)
.push(icon!("go-previous-symbolic", (this.on_prev)())) .push(icon!("go-previous-symbolic", (this.on_prev)()))