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 ++-------
 graphics/src/primitive.rs |  2 --
 graphics/src/renderer.rs  | 27 +++++++++++++++++++++------
 3 files changed, 23 insertions(+), 15 deletions(-)

(limited to 'graphics')

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,
                     );
diff --git a/graphics/src/primitive.rs b/graphics/src/primitive.rs
index 32f8383d..b984feaa 100644
--- a/graphics/src/primitive.rs
+++ b/graphics/src/primitive.rs
@@ -66,8 +66,6 @@ pub enum Primitive {
     Clip {
         /// The bounds of the clip
         bounds: Rectangle,
-        /// The offset transformation of the clip
-        offset: Vector<u32>,
         /// The content of the clip
         content: Box<Primitive>,
     },
diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs
index d90a3f1e..8b6c2217 100644
--- a/graphics/src/renderer.rs
+++ b/graphics/src/renderer.rs
@@ -51,10 +51,26 @@ where
         layout
     }
 
-    fn with_layer(
+    fn with_layer(&mut self, bounds: Rectangle, f: impl FnOnce(&mut Self)) {
+        let current_primitives =
+            std::mem::replace(&mut self.primitives, Vec::new());
+
+        f(self);
+
+        let layer_primitives =
+            std::mem::replace(&mut self.primitives, current_primitives);
+
+        self.primitives.push(Primitive::Clip {
+            bounds,
+            content: Box::new(Primitive::Group {
+                primitives: layer_primitives,
+            }),
+        });
+    }
+
+    fn with_translation(
         &mut self,
-        bounds: Rectangle,
-        offset: Vector<u32>,
+        translation: Vector,
         f: impl FnOnce(&mut Self),
     ) {
         let current_primitives =
@@ -65,9 +81,8 @@ where
         let layer_primitives =
             std::mem::replace(&mut self.primitives, current_primitives);
 
-        self.primitives.push(Primitive::Clip {
-            bounds,
-            offset,
+        self.primitives.push(Primitive::Translate {
+            translation,
             content: Box::new(Primitive::Group {
                 primitives: layer_primitives,
             }),
-- 
cgit