Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement Display for Val #10296

Merged
merged 4 commits into from
Oct 28, 2023
Merged

Implement Display for Val #10296

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a6a9b4
Implemented Display for Val
ickshonpe Oct 28, 2023
aef72f6
Combined the match statements.
ickshonpe Oct 28, 2023
7fabe04
Merge branch 'main' into impl-Display-for-Val
alice-i-cecile Oct 28, 2023
ac42eb1
cargo fmt --all
ickshonpe Oct 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions crates/bevy_ui/src/geometry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use bevy_reflect::ReflectDeserialize;
use bevy_reflect::ReflectSerialize;
use serde::Deserialize;
use serde::Serialize;
use std::fmt::Display;
use std::ops::{Div, DivAssign, Mul, MulAssign};
use thiserror::Error;

Expand Down Expand Up @@ -154,6 +155,22 @@ impl DivAssign<f32> for Val {
}
}

impl Display for Val {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
let (value, suffix) = match self {
Val::Auto => return write!(f, "auto"),
Val::Px(value) => (value, "px"),
Val::Percent(value) => (value, "%"),
Val::Vw(value) => (value, "vw"),
Val::Vh(value) => (value, "vh"),
Val::VMin(value) => (value, "vmin"),
Val::VMax(value) => (value, "vmax"),
};
value.fmt(f)?;
write!(f, "{suffix}")
Comment on lines +170 to +171
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would this be equivalent or does it result in a different output?

Suggested change
value.fmt(f)?;
write!(f, "{suffix}")
write!(f, "{value}{suffix}")

Copy link
Contributor Author

@ickshonpe ickshonpe Oct 28, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The first version allows you to specify formatting options.

So with value.fmt(f)?

println!("{:.2}", Val::Px(0.5689));

has output

0.57

whereas with write!(f, "{value}{suffix}") it will display

0.5689

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's good to know, thanks!

}
}

#[derive(Debug, Eq, PartialEq, Clone, Copy, Error)]
pub enum ValArithmeticError {
#[error("the variants of the Vals don't match")]
Expand Down