Merge branch 'master' into remove-vertex-indexing

1 files changed, 21 insertions, 2 deletions

diff --git a/wgpu/src/layer/text.rs b/wgpu/src/layer/text.rs
index b61615d6..37ee5247 100644
--- a/wgpu/src/layer/text.rs
+++ b/wgpu/src/layer/text.rs
@@ -1,17 +1,33 @@
 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;
 
-/// A paragraph of text.
+/// A text primitive.
 #[derive(Debug, Clone)]
 pub enum Text<'a> {
-    Managed {
+    /// A paragraph.
+    #[allow(missing_docs)]
+    Paragraph {
         paragraph: paragraph::Weak,
         position: Point,
         color: Color,
+        clip_bounds: Rectangle,
     },
+    /// An editor.
+    #[allow(missing_docs)]
+    Editor {
+        editor: editor::Weak,
+        position: Point,
+        color: Color,
+        clip_bounds: Rectangle,
+    },
+    /// Some cached text.
     Cached(Cached<'a>),
+    /// Some raw text.
+    Raw(graphics::text::Raw),
 }
 
 #[derive(Debug, Clone)]
@@ -42,4 +58,7 @@ pub struct Cached<'a> {
 
     /// The shaping strategy of the text.
     pub shaping: text::Shaping,
+
+    /// The clip bounds of the text.
+    pub clip_bounds: Rectangle,
 }