me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: replace text(format!( with text macro

Browse source
This commit is contained in:
Richard Custodio 2024-03-18 17:08:56 -03:00
parent 6146382676
commit bf9bbf4a3e
No known key found for this signature in database
GPG key ID: 95F51F46E2C6E8D7
18 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

4
examples/custom_quad/src/main.rs
View file

@ -165,7 +165,7 @@ impl Example {
self.border_width,
self.shadow
),
text(format!("Radius: {tl:.2}/{tr:.2}/{br:.2}/{bl:.2}")),
text!("Radius: {tl:.2}/{tr:.2}/{br:.2}/{bl:.2}"),
slider(1.0..=100.0, tl, Message::RadiusTopLeftChanged).step(0.01),
slider(1.0..=100.0, tr, Message::RadiusTopRightChanged).step(0.01),
slider(1.0..=100.0, br, Message::RadiusBottomRightChanged)
@ -174,7 +174,7 @@ impl Example {
.step(0.01),
slider(1.0..=10.0, self.border_width, Message::BorderWidthChanged)
.step(0.01),
text(format!("Shadow: {sx:.2}x{sy:.2}, {sr:.2}")),
text!("Shadow: {sx:.2}x{sy:.2}, {sr:.2}"),
slider(-100.0..=100.0, sx, Message::ShadowXOffsetChanged)
.step(0.01),
slider(-100.0..=100.0, sy, Message::ShadowYOffsetChanged)

2
examples/custom_widget/src/main.rs
View file

@ -114,7 +114,7 @@ impl Example {
fn view(&self) -> Element<Message> {
let content = column![
circle(self.radius),
text(format!("Radius: {:.2}", self.radius)),
text!("Radius: {:.2}", self.radius),
slider(1.0..=100.0, self.radius, Message::RadiusChanged).step(0.01),
]
.padding(20)

2
examples/download_progress/src/main.rs
View file

@ -166,7 +166,7 @@ impl Download {
.into()
}
State::Downloading { .. } => {
text(format!("Downloading... {current_progress:.2}%")).into()
text!("Downloading... {current_progress:.2}%").into()
}
State::Errored => column![
"Something went wrong :(",

2
examples/events/src/main.rs
View file

@ -61,7 +61,7 @@ impl Events {
let events = Column::with_children(
self.last
.iter()
.map(|event| text(format!("{event:?}")).size(40))
.map(|event| text!("{event:?}").size(40))
.map(Element::from),
);

2
examples/game_of_life/src/main.rs
View file

@ -163,7 +163,7 @@ fn view_controls<'a>(
let speed_controls = row![
slider(1.0..=1000.0, speed as f32, Message::SpeedChanged),
text(format!("x{speed}")).size(16),
text!("x{speed}").size(16),
]
.align_items(Alignment::Center)
.spacing(10);

2
examples/integration/src/controls.rs
View file

@ -78,7 +78,7 @@ impl Program for Controls {
container(
column![
text("Background color").color(Color::WHITE),
text(format!("{background_color:?}"))
text!("{background_color:?}")
.size(14)
.color(Color::WHITE),
text_input("Placeholder", &self.input)

2
examples/lazy/src/main.rs
View file

@ -192,7 +192,7 @@ impl App {
text_input("Add a new option", &self.input)
.on_input(Message::InputChanged)
.on_submit(Message::AddItem(self.input.clone())),
button(text(format!("Toggle Order ({})", self.order)))
button(text!("Toggle Order ({})", self.order))
.on_press(Message::ToggleOrder)
]
.spacing(10)

2
examples/loading_spinners/src/main.rs
View file

@ -81,7 +81,7 @@ impl LoadingSpinners {
Message::CycleDurationChanged(x / 100.0)
})
.width(200.0),
text(format!("{:.2}s", self.cycle_duration)),
text!("{:.2}s", self.cycle_duration),
]
.align_items(iced::Alignment::Center)
.spacing(20.0),

2
examples/pane_grid/src/main.rs
View file

@ -285,7 +285,7 @@ fn view_content<'a>(
.max_width(160);
let content = column![
text(format!("{}x{}", size.width, size.height)).size(24),
text!("{}x{}", size.width, size.height).size(24),
controls,
]
.spacing(10)

2
examples/pokedex/src/main.rs
View file

@ -109,7 +109,7 @@ impl Pokemon {
column![
row![
text(&self.name).size(30).width(Length::Fill),
text(format!("#{}", self.number))
text!("#{}", self.number)
.size(20)
.color([0.5, 0.5, 0.5]),
]

2
examples/screenshot/src/main.rs
View file

@ -163,7 +163,7 @@ impl Example {
.push_maybe(
self.crop_error
.as_ref()
.map(|error| text(format!("Crop error! \n{error}"))),
.map(|error| text!("Crop error! \n{error}")),
)
.spacing(10)
.align_items(Alignment::Center);

2
examples/sierpinski_triangle/src/main.rs
View file

@ -54,7 +54,7 @@ impl SierpinskiEmulator {
.width(Length::Fill)
.height(Length::Fill),
row![
text(format!("Iteration: {:?}", self.graph.iteration)),
text!("Iteration: {:?}", self.graph.iteration),
slider(0..=10000, self.graph.iteration, Message::IterationSet)
]
.padding(10)

4
examples/stopwatch/src/main.rs
View file

@ -92,13 +92,13 @@ impl Stopwatch {
let seconds = self.duration.as_secs();
let duration = text(format!(
let duration = text!(
"{:0>2}:{:0>2}:{:0>2}.{:0>2}",
seconds / HOUR,
(seconds % HOUR) / MINUTE,
seconds % MINUTE,
self.duration.subsec_millis() / 10,
))
)
.size(40);
let button = |label| {

36
examples/system_information/src/main.rs
View file

@ -45,56 +45,56 @@ impl Example {
let content: Element<_> = match self {
Example::Loading => text("Loading...").size(40).into(),
Example::Loaded { information } => {
let system_name = text(format!(
let system_name = text!(
"System name: {}",
information
.system_name
.as_ref()
.unwrap_or(&"unknown".to_string())
));
);
let system_kernel = text(format!(
let system_kernel = text!(
"System kernel: {}",
information
.system_kernel
.as_ref()
.unwrap_or(&"unknown".to_string())
));
);
let system_version = text(format!(
let system_version = text!(
"System version: {}",
information
.system_version
.as_ref()
.unwrap_or(&"unknown".to_string())
));
);
let system_short_version = text(format!(
let system_short_version = text!(
"System short version: {}",
information
.system_short_version
.as_ref()
.unwrap_or(&"unknown".to_string())
));
);
let cpu_brand =
text(format!("Processor brand: {}", information.cpu_brand));
text!("Processor brand: {}", information.cpu_brand);
let cpu_cores = text(format!(
let cpu_cores = text!(
"Processor cores: {}",
information
.cpu_cores
.map_or("unknown".to_string(), |cores| cores
.to_string())
));
);
let memory_readable =
ByteSize::b(information.memory_total).to_string();
let memory_total = text(format!(
let memory_total = text!(
"Memory (total): {} bytes ({memory_readable})",
information.memory_total,
));
);
let memory_text = if let Some(memory_used) =
information.memory_used
@ -106,17 +106,17 @@ impl Example {
String::from("None")
};
let memory_used = text(format!("Memory (used): {memory_text}"));
let memory_used = text!("Memory (used): {memory_text}");
let graphics_adapter = text(format!(
let graphics_adapter = text!(
"Graphics adapter: {}",
information.graphics_adapter
));
);
let graphics_backend = text(format!(
let graphics_backend = text!(
"Graphics backend: {}",
information.graphics_backend
));
);
column![
system_name.size(30),

2
examples/toast/src/main.rs
View file

@ -131,7 +131,7 @@ impl App {
subtitle(
"Timeout",
row![
text(format!("{:0>2} sec", self.timeout_secs)),
text!("{:0>2} sec", self.timeout_secs),
slider(
1.0..=30.0,
self.timeout_secs as f64,

4
examples/todos/src/main.rs
View file

@ -396,10 +396,10 @@ fn view_controls(tasks: &[Task], current_filter: Filter) -> Element<Message> {
};
row![
text(format!(
text!(
"{tasks_left} {} left",
if tasks_left == 1 { "task" } else { "tasks" }
))
)
.width(Length::Fill),
row![
filter_button("All", Filter::All, current_filter),

8
examples/tour/src/main.rs
View file

@ -433,7 +433,7 @@ impl<'a> Step {
let spacing_section = column![
slider(0..=80, spacing, StepMessage::SpacingChanged),
text(format!("{spacing} px"))
text!("{spacing} px")
.width(Length::Fill)
.horizontal_alignment(alignment::Horizontal::Center),
]
@ -457,7 +457,7 @@ impl<'a> Step {
fn text(size: u16, color: Color) -> Column<'a, StepMessage> {
let size_section = column![
"You can change its size:",
text(format!("This text is {size} pixels")).size(size),
text!("This text is {size} pixels").size(size),
slider(10..=70, size, StepMessage::TextSizeChanged),
]
.padding(20)
@ -472,7 +472,7 @@ impl<'a> Step {
let color_section = column![
"And its color:",
text(format!("{color:?}")).color(color),
text!("{color:?}").color(color),
color_sliders,
]
.padding(20)
@ -544,7 +544,7 @@ impl<'a> Step {
.push(ferris(width, filter_method))
.push(slider(100..=500, width, StepMessage::ImageWidthChanged))
.push(
text(format!("Width: {width} px"))
text!("Width: {width} px")
.width(Length::Fill)
.horizontal_alignment(alignment::Horizontal::Center),
)

2
examples/vectorial_text/src/main.rs
View file

@ -55,7 +55,7 @@ impl VectorialText {
row![
text(label),
horizontal_space(),
text(format!("{:.2}", value))
text!("{:.2}", value)
],
slider(range, value, message).step(0.01)
]