diff options
| author | 2023-12-05 02:19:17 +0100 | |
|---|---|---|
| committer | 2023-12-05 02:19:17 +0100 | |
| commit | 603832e66c710ea39a95009ddc905de20c6856bd (patch) | |
| tree | 9682de5108d8102b25c109c0388556c7c49794ec /tiny_skia | |
| parent | fc285d3e461626408c56bbc1605fcf0c974b2f69 (diff) | |
| download | iced-603832e66c710ea39a95009ddc905de20c6856bd.tar.gz iced-603832e66c710ea39a95009ddc905de20c6856bd.tar.bz2 iced-603832e66c710ea39a95009ddc905de20c6856bd.zip | |
Introduce `RawText` to `Primitive` in `iced_graphics`
This should allow users to directly render a
`cosmic_text::Buffer`.
Diffstat (limited to '')
| -rw-r--r-- | tiny_skia/src/backend.rs | 30 | ||||
| -rw-r--r-- | tiny_skia/src/text.rs | 29 | 
2 files changed, 58 insertions, 1 deletions
| diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs index 3e9bd2a5..706db40e 100644 --- a/tiny_skia/src/backend.rs +++ b/tiny_skia/src/backend.rs @@ -1,5 +1,6 @@  use crate::core::{Background, Color, Gradient, Rectangle, Vector};  use crate::graphics::backend; +use crate::graphics::text;  use crate::graphics::Viewport;  use crate::primitive::{self, Primitive}; @@ -444,6 +445,35 @@ impl Backend {                      clip_mask,                  );              } +            Primitive::RawText(text::Raw { +                buffer, +                position, +                color, +                clip_bounds: text_clip_bounds, +            }) => { +                let Some(buffer) = buffer.upgrade() else { +                    return; +                }; + +                let physical_bounds = +                    (*text_clip_bounds + translation) * scale_factor; + +                if !clip_bounds.intersects(&physical_bounds) { +                    return; +                } + +                let clip_mask = (!physical_bounds.is_within(&clip_bounds)) +                    .then_some(clip_mask as &_); + +                self.text_pipeline.draw_raw( +                    &buffer, +                    *position + translation, +                    *color, +                    scale_factor, +                    pixels, +                    clip_mask, +                ); +            }              #[cfg(feature = "image")]              Primitive::Image {                  handle, diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs index 70e95d01..a5a0a1b6 100644 --- a/tiny_skia/src/text.rs +++ b/tiny_skia/src/text.rs @@ -1,6 +1,6 @@  use crate::core::alignment;  use crate::core::text::{LineHeight, Shaping}; -use crate::core::{Color, Font, Pixels, Point, Rectangle}; +use crate::core::{Color, Font, Pixels, Point, Rectangle, Size};  use crate::graphics::color;  use crate::graphics::text::cache::{self, Cache};  use crate::graphics::text::editor; @@ -149,6 +149,33 @@ impl Pipeline {          );      } +    pub fn draw_raw( +        &mut self, +        buffer: &cosmic_text::Buffer, +        position: Point, +        color: Color, +        scale_factor: f32, +        pixels: &mut tiny_skia::PixmapMut<'_>, +        clip_mask: Option<&tiny_skia::Mask>, +    ) { +        let mut font_system = font_system().write().expect("Write font system"); + +        let (width, height) = buffer.size(); + +        draw( +            font_system.raw(), +            &mut self.glyph_cache, +            buffer, +            Rectangle::new(position, Size::new(width, height)), +            color, +            alignment::Horizontal::Left, +            alignment::Vertical::Top, +            scale_factor, +            pixels, +            clip_mask, +        ); +    } +      pub fn trim_cache(&mut self) {          self.cache.get_mut().trim();          self.glyph_cache.trim(); | 
