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

Overhaul Font type to allow font family selection

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-02-04 07:33:33 +01:00
parent a7580e0696
commit b29de28d1f
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
25 changed files with 147 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

11
native/src/widget/radio.rs
View file

@ -53,7 +53,7 @@ where
size: f32,
spacing: f32,
text_size: Option<f32>,
font: Renderer::Font,
font: Option<Renderer::Font>,
style: <Renderer::Theme as StyleSheet>::Style,
}
@ -95,7 +95,7 @@ where
size: Self::DEFAULT_SIZE,
spacing: Self::DEFAULT_SPACING, //15
text_size: None,
font: Default::default(),
font: None,
style: Default::default(),
}
}
@ -125,8 +125,8 @@ where
}
/// Sets the text font of the [`Radio`] button.
pub fn font(mut self, font: Renderer::Font) -> Self {
self.font = font;
pub fn font(mut self, font: impl Into<Renderer::Font>) -> Self {
self.font = Some(font.into());
self
}
@ -268,6 +268,7 @@ where
{
let label_layout = children.next().unwrap();
let font = self.font.unwrap_or(renderer.default_font());
widget::text::draw(
renderer,
@ -275,7 +276,7 @@ where
label_layout,
&self.label,
self.text_size,
self.font.clone(),
font,
widget::text::Appearance {
color: custom_style.text_color,
},