leyoda/iced-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Use Pixels for Text::size

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-02-04 16:41:18 +01:00
parent de7fc637cf
commit a2ab9e9395
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
7 changed files with 19 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
native/src/widget/text.rs
View file

@ -160,15 +160,13 @@ where
_cursor_position: Point,
_viewport: &Rectangle,
) {
let font = self.font.unwrap_or_else(|| renderer.default_font());
draw(
renderer,
style,
layout,
&self.content,
self.size,
font,
self.font,
theme.appearance(self.style),
self.horizontal_alignment,
self.vertical_alignment,
@ -192,7 +190,7 @@ pub fn draw<Renderer>(
layout: Layout<'_>,
content: &str,
size: Option<f32>,
font: Renderer::Font,
font: Option<Renderer::Font>,
appearance: Appearance,
horizontal_alignment: alignment::Horizontal,
vertical_alignment: alignment::Vertical,
@ -218,7 +216,7 @@ pub fn draw<Renderer>(
size: size.unwrap_or_else(|| renderer.default_size()),
bounds: Rectangle { x, y, ..bounds },
color: appearance.color.unwrap_or(style.text_color),
font,
font: font.unwrap_or_else(|| renderer.default_font()),
horizontal_alignment,
vertical_alignment,
});