From 3a0c503db99eb3d45ac971132904df419ee566b6 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 14 Oct 2021 16:59:19 +0700 Subject: Implement `Widget::draw` for `Text` --- native/src/renderer/null.rs | 11 +++++++++-- native/src/renderer/text.rs | 20 ++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 native/src/renderer/text.rs (limited to 'native/src/renderer') diff --git a/native/src/renderer/null.rs b/native/src/renderer/null.rs index 1ffca5c9..da758ebb 100644 --- a/native/src/renderer/null.rs +++ b/native/src/renderer/null.rs @@ -4,12 +4,13 @@ use crate::container; use crate::pane_grid; use crate::progress_bar; use crate::radio; +use crate::renderer::{self, Renderer}; use crate::scrollable; use crate::slider; use crate::text; use crate::text_input; use crate::toggler; -use crate::{Font, Padding, Point, Rectangle, Renderer, Size}; +use crate::{Font, Padding, Point, Rectangle, Size}; /// A renderer that does nothing. /// @@ -28,11 +29,17 @@ impl Renderer for Null { type Defaults = (); fn with_layer(&mut self, _bounds: Rectangle, _f: impl FnOnce(&mut Self)) {} + + fn clear(&mut self) {} } -impl text::Renderer for Null { +impl renderer::Text for Null { type Font = Font; + fn fill_text(&mut self, _text: renderer::text::Section<'_, Self::Font>) {} +} + +impl text::Renderer for Null { fn default_size(&self) -> u16 { 20 } diff --git a/native/src/renderer/text.rs b/native/src/renderer/text.rs new file mode 100644 index 00000000..5c189d89 --- /dev/null +++ b/native/src/renderer/text.rs @@ -0,0 +1,20 @@ +use crate::alignment; +use crate::{Color, Rectangle, Renderer}; + +pub trait Text: Renderer { + /// The font type used. + type Font: Default + Copy; + + fn fill_text(&mut self, section: Section<'_, Self::Font>); +} + +#[derive(Debug, Clone, Copy)] +pub struct Section<'a, Font> { + pub content: &'a str, + pub bounds: Rectangle, + pub size: Option, + pub color: Option, + pub font: Font, + pub horizontal_alignment: alignment::Horizontal, + pub vertical_alignment: alignment::Vertical, +} -- cgit