traxys/Glaurung
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only use two decimals for amounts

Browse source
This commit is contained in:
Quentin Boyer 2023-11-13 23:30:35 +01:00
parent d8983ea679
commit 7e17fb12c9
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/main.rs
View file

@ -223,7 +223,7 @@ where
.iter() .iter()
.map(|(name, &value)| row![ .map(|(name, &value)| row![
text(name).size(TEXT_EMPH1), text(name).size(TEXT_EMPH1),
text(&format!("{value} €")), text(&format!("{value:.2} €")),
horizontal_space(Length::Fill), horizontal_space(Length::Fill),
component(EditFixed::new(value, name, |v| FixedAmountsMessage::DoAdd( component(EditFixed::new(value, name, |v| FixedAmountsMessage::DoAdd(
name.to_string(), name.to_string(),
@ -237,7 +237,7 @@ where
.collect() .collect()
), ),
horizontal_rule(LIST_RULE), horizontal_rule(LIST_RULE),
text(&format!("Total: {} €", self.items.values().sum::<f64>())).size(TEXT_EMPH2) text(&format!("Total: {:.2} €", self.items.values().sum::<f64>())).size(TEXT_EMPH2)
] ]
.align_items(Alignment::Center); .align_items(Alignment::Center);
@ -474,7 +474,7 @@ where
col.push( col.push(
row![ row![
horizontal_space(Length::Fill), horizontal_space(Length::Fill),
text(&format!(" = {value} €")), text(&format!(" = {value:.2} €")),
] ]
.into(), .into(),
); );
@ -487,7 +487,7 @@ where
), ),
horizontal_rule(LIST_RULE), horizontal_rule(LIST_RULE),
text(&format!( text(&format!(
"Total: {} €", "Total: {:.2} €",
self.items.values().flat_map(|(_, v)| v).sum::<f64>() self.items.values().flat_map(|(_, v)| v).sum::<f64>()
)) ))
.size(TEXT_EMPH2) .size(TEXT_EMPH2)
@ -1178,7 +1178,7 @@ impl Application for Glaurung {
let def = rule::StyleSheet::appearance(theme, &theme::Rule::Default); let def = rule::StyleSheet::appearance(theme, &theme::Rule::Default);
rule::Appearance { width: 3, ..def } rule::Appearance { width: 3, ..def }
}), }),
text(&format!("Total spendings: {total_spendings} €",)).size(TEXT_EMPH2), text(&format!("Total spendings: {total_spendings:.2} €",)).size(TEXT_EMPH2),
text("Earnings").size(TEXT_H1), text("Earnings").size(TEXT_H1),
row![ row![
text(&self.config.person_1).size(TEXT_EMPH1), text(&self.config.person_1).size(TEXT_EMPH1),
@ -1198,9 +1198,9 @@ impl Application for Glaurung {
}) })
] ]
.align_items(iced::Alignment::Center), .align_items(iced::Alignment::Center),
text(&format!("Total earnings: {total_earnings} €",)).size(TEXT_EMPH2), text(&format!("Total earnings: {total_earnings:.2} €",)).size(TEXT_EMPH2),
text("Outputs").size(TEXT_H1), text("Outputs").size(TEXT_H1),
text(&format!("Main account: {main_account} €")).size(TEXT_EMPH2), text(&format!("Main account: {main_account:.2} €")).size(TEXT_EMPH2),
component(FixedAmounts { component(FixedAmounts {
items: &self.edit.savings, items: &self.edit.savings,
title: "Savings", title: "Savings",