From 0c6c85429e313c538d7fe3cd25a49ef818293a6e Mon Sep 17 00:00:00 2001 From: Ashley Wulber <48420062+wash2@users.noreply.github.com> Date: Mon, 27 Oct 2025 11:24:02 -0400 Subject: [PATCH] chore: update iced (#1029) --- iced | 2 +- src/widget/calendar.rs | 36 +++++++++++++++++++----------------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/iced b/iced index cfe5f4b..783d764 160000 --- a/iced +++ b/iced @@ -1 +1 @@ -Subproject commit cfe5f4b1a4413b9c94c10832093b2a9e0de5eece +Subproject commit 783d764cabd6eee020eeae3b50a0d4727a721056 diff --git a/src/widget/calendar.rs b/src/widget/calendar.rs index 134e84f..7f9ac0a 100644 --- a/src/widget/calendar.rs +++ b/src/widget/calendar.rs @@ -5,11 +5,11 @@ use std::cmp; +use crate::fl; use crate::iced_core::{Alignment, Length, Padding}; use crate::widget::{Grid, button, column, grid, icon, row, text}; use apply::Apply; use chrono::{Datelike, Days, Local, Month, Months, NaiveDate, Weekday}; -use crate::fl; /// A widget that displays an interactive calendar. pub fn calendar( @@ -133,20 +133,20 @@ where macro_rules! translate_month { ($month:expr, $year:expr) => {{ match $month { - chrono::Month::January => fl!("january", year=$year), - chrono::Month::February => fl!("february", year=$year), - chrono::Month::March => fl!("march", year=$year), - chrono::Month::April => fl!("april", year=$year), - chrono::Month::May => fl!("may", year=$year), - chrono::Month::June => fl!("june", year=$year), - chrono::Month::July => fl!("july", year=$year), - chrono::Month::August => fl!("august", year=$year), - chrono::Month::September => fl!("september", year=$year), - chrono::Month::October => fl!("october", year=$year), - chrono::Month::November => fl!("november", year=$year), - chrono::Month::December => fl!("december", year=$year) + chrono::Month::January => fl!("january", year = $year), + chrono::Month::February => fl!("february", year = $year), + chrono::Month::March => fl!("march", year = $year), + chrono::Month::April => fl!("april", year = $year), + chrono::Month::May => fl!("may", year = $year), + chrono::Month::June => fl!("june", year = $year), + chrono::Month::July => fl!("july", year = $year), + chrono::Month::August => fl!("august", year = $year), + chrono::Month::September => fl!("september", year = $year), + chrono::Month::October => fl!("october", year = $year), + chrono::Month::November => fl!("november", year = $year), + chrono::Month::December => fl!("december", year = $year), } - }} + }}; } macro_rules! translate_weekday { ($weekday:expr) => {{ @@ -157,15 +157,17 @@ where Weekday::Thu => fl!("thursday"), Weekday::Fri => fl!("friday"), Weekday::Sat => fl!("saturday"), - Weekday::Sun => fl!("sunday") + Weekday::Sun => fl!("sunday"), } - }} + }}; } let date = text(translate_month!( Month::try_from(this.model.visible.month() as u8) .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) .push(icon!("go-previous-symbolic", (this.on_prev)()))