djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

iso 8601 date format

Browse source
This commit is contained in:
René Rössler 2022-02-09 12:37:02 +01:00
parent 0cd74376a7
commit 27c72efdc7
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
egui_demo_lib/src/apps/demo/widget_gallery/serde_date_format.rs
View file

@ -1,11 +1,13 @@
use chrono::{Date, DateTime, Utc}; use chrono::{Date, NaiveDate, Utc};
use serde::{self, Deserialize, Deserializer, Serializer}; use serde::{self, Deserialize, Deserializer, Serializer};
const FORMAT: &str = "%Y-%m-%d";
pub fn serialize<S>(date: &Date<Utc>, serializer: S) -> Result<S::Ok, S::Error> pub fn serialize<S>(date: &Date<Utc>, serializer: S) -> Result<S::Ok, S::Error>
where where
S: Serializer, S: Serializer,
{ {
let s = date.and_hms(0, 0, 0).to_rfc3339(); let s = format!("{}", date.format(FORMAT));
serializer.serialize_str(&s) serializer.serialize_str(&s)
} }
@ -15,7 +17,7 @@ where
{ {
let s = String::deserialize(deserializer)?; let s = String::deserialize(deserializer)?;
DateTime::parse_from_rfc3339(&s) NaiveDate::parse_from_str(&s, FORMAT)
.map(|date_time| date_time.date().with_timezone(&Utc)) .map(|naive_date| Date::from_utc(naive_date, Utc))
.map_err(serde::de::Error::custom) .map_err(serde::de::Error::custom)
} }

3
egui_extras/src/datepicker/button.rs
View file

@ -70,8 +70,7 @@ impl<'a> Widget for DatePickerButton<'a> {
.get_persisted::<DatePickerButtonState>(id) .get_persisted::<DatePickerButtonState>(id)
.unwrap_or_default(); .unwrap_or_default();
//TODO: Internationalization let mut text = RichText::new(format!("{} 📆", self.selection.format("%Y-%m-%d")));
let mut text = RichText::new(format!("{} 📆", self.selection.format("%d.%m.%Y")));
let visuals = ui.visuals().widgets.open; let visuals = ui.visuals().widgets.open;
if button_state.picker_visible { if button_state.picker_visible {
text = text.color(visuals.text_color()); text = text.color(visuals.text_color());