From 3a0c503db99eb3d45ac971132904df419ee566b6 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 14 Oct 2021 16:59:19 +0700
Subject: Implement `Widget::draw` for `Text`

---
 graphics/src/layer.rs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'graphics/src/layer.rs')

diff --git a/graphics/src/layer.rs b/graphics/src/layer.rs
index 9653a2e4..e5cb64c3 100644
--- a/graphics/src/layer.rs
+++ b/graphics/src/layer.rs
@@ -74,7 +74,7 @@ impl<'a> Layer<'a> {
     /// Distributes the given [`Primitive`] and generates a list of layers based
     /// on its contents.
     pub fn generate(
-        primitive: &'a Primitive,
+        primitives: &'a [Primitive],
         viewport: &Viewport,
     ) -> Vec<Self> {
         let first_layer =
@@ -82,12 +82,14 @@ impl<'a> Layer<'a> {
 
         let mut layers = vec![first_layer];
 
-        Self::process_primitive(
-            &mut layers,
-            Vector::new(0.0, 0.0),
-            primitive,
-            0,
-        );
+        for primitive in primitives {
+            Self::process_primitive(
+                &mut layers,
+                Vector::new(0.0, 0.0),
+                primitive,
+                0,
+            );
+        }
 
         layers
     }
-- 
cgit 


From 4a11cbd99445338619dfaf1f327dbc25b2983cb7 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Mon, 25 Oct 2021 16:16:35 +0700
Subject: Implement `Widget::mouse_interaction` for `PaneGrid`

... and fix rendering of drag interaction in `PaneGrid` by
introducing an explicit `with_translation` method to `Renderer`
and simplifying the `with_layer` and `Clip` primitive.
---
 graphics/src/layer.rs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'graphics/src/layer.rs')

diff --git a/graphics/src/layer.rs b/graphics/src/layer.rs
index e5cb64c3..7a32c850 100644
--- a/graphics/src/layer.rs
+++ b/graphics/src/layer.rs
@@ -175,11 +175,7 @@ impl<'a> Layer<'a> {
                     });
                 }
             }
-            Primitive::Clip {
-                bounds,
-                offset,
-                content,
-            } => {
+            Primitive::Clip { bounds, content } => {
                 let layer = &mut layers[current_layer];
                 let translated_bounds = *bounds + translation;
 
@@ -192,8 +188,7 @@ impl<'a> Layer<'a> {
 
                     Self::process_primitive(
                         layers,
-                        translation
-                            - Vector::new(offset.x as f32, offset.y as f32),
+                        translation,
                         content,
                         layers.len() - 1,
                     );
-- 
cgit