Add custom font support to Checkbox

This commit is contained in:
Héctor Ramón Jiménez 2020-07-28 08:21:33 +02:00
parent 55d2c5886f
commit 5fd239c488

View File

@ -33,6 +33,7 @@ pub struct Checkbox<Message, Renderer: self::Renderer + text::Renderer> {
size: u16, size: u16,
spacing: u16, spacing: u16,
text_size: Option<u16>, text_size: Option<u16>,
font: Renderer::Font,
style: Renderer::Style, style: Renderer::Style,
} }
@ -61,6 +62,7 @@ impl<Message, Renderer: self::Renderer + text::Renderer>
size: <Renderer as self::Renderer>::DEFAULT_SIZE, size: <Renderer as self::Renderer>::DEFAULT_SIZE,
spacing: Renderer::DEFAULT_SPACING, spacing: Renderer::DEFAULT_SPACING,
text_size: None, text_size: None,
font: Renderer::Font::default(),
style: Renderer::Style::default(), style: Renderer::Style::default(),
} }
} }
@ -97,6 +99,15 @@ impl<Message, Renderer: self::Renderer + text::Renderer>
self self
} }
/// Sets the [`Font`] of the text of the [`Checkbox`].
///
/// [`Checkbox`]: struct.Checkbox.html
/// [`Font`]: ../../struct.Font.html
pub fn font(mut self, font: Renderer::Font) -> Self {
self.font = font;
self
}
/// Sets the style of the [`Checkbox`]. /// Sets the style of the [`Checkbox`].
/// ///
/// [`Checkbox`]: struct.Checkbox.html /// [`Checkbox`]: struct.Checkbox.html
@ -182,7 +193,7 @@ where
label_layout.bounds(), label_layout.bounds(),
&self.label, &self.label,
self.text_size.unwrap_or(renderer.default_size()), self.text_size.unwrap_or(renderer.default_size()),
Default::default(), self.font,
None, None,
HorizontalAlignment::Left, HorizontalAlignment::Left,
VerticalAlignment::Center, VerticalAlignment::Center,