diff options
author | 2024-01-12 06:45:40 +0100 | |
---|---|---|
committer | 2024-01-12 06:45:40 +0100 | |
commit | a5ae442819227b3cd55116028e6d6c96caa6fda9 (patch) | |
tree | 111e7b424a2c7044f8d98612015540282bf2ca8a /wgpu/src/layer | |
parent | 89fc4f54bdbf62a29fcd06bc2e77926180143413 (diff) | |
parent | 603832e66c710ea39a95009ddc905de20c6856bd (diff) | |
download | iced-a5ae442819227b3cd55116028e6d6c96caa6fda9.tar.gz iced-a5ae442819227b3cd55116028e6d6c96caa6fda9.tar.bz2 iced-a5ae442819227b3cd55116028e6d6c96caa6fda9.zip |
Merge pull request #2158 from iced-rs/feature/raw-text-primitive
Introduce `RawText` to `Primitive` in `iced_graphics`
Diffstat (limited to '')
-rw-r--r-- | wgpu/src/layer.rs | 15 | ||||
-rw-r--r-- | wgpu/src/layer/text.rs | 5 |
2 files changed, 19 insertions, 1 deletions
diff --git a/wgpu/src/layer.rs b/wgpu/src/layer.rs index 557a7633..4ad12a88 100644 --- a/wgpu/src/layer.rs +++ b/wgpu/src/layer.rs @@ -177,6 +177,21 @@ impl<'a> Layer<'a> { clip_bounds: *clip_bounds + translation, })); } + graphics::Primitive::RawText(graphics::text::Raw { + buffer, + position, + color, + clip_bounds, + }) => { + let layer = &mut layers[current_layer]; + + layer.text.push(Text::Raw(graphics::text::Raw { + buffer: buffer.clone(), + position: *position + translation, + color: *color, + clip_bounds: *clip_bounds + translation, + })); + } Primitive::Quad { bounds, background, diff --git a/wgpu/src/layer/text.rs b/wgpu/src/layer/text.rs index df2f2875..37ee5247 100644 --- a/wgpu/src/layer/text.rs +++ b/wgpu/src/layer/text.rs @@ -1,6 +1,7 @@ use crate::core::alignment; use crate::core::text; use crate::core::{Color, Font, Pixels, Point, Rectangle}; +use crate::graphics; use crate::graphics::text::editor; use crate::graphics::text::paragraph; @@ -23,8 +24,10 @@ pub enum Text<'a> { color: Color, clip_bounds: Rectangle, }, - /// A cached text. + /// Some cached text. Cached(Cached<'a>), + /// Some raw text. + Raw(graphics::text::Raw), } #[derive(Debug, Clone)] |