shader_element: Store and set location separately

2 files changed, 11 insertions, 8 deletions

diff --git a/niri-visual-tests/src/cases/gradient_angle.rs b/niri-visual-tests/src/cases/gradient_angle.rs
index 063304a9..f9871a93 100644
--- a/niri-visual-tests/src/cases/gradient_angle.rs
+++ b/niri-visual-tests/src/cases/gradient_angle.rs
@@ -62,15 +62,16 @@ impl TestCase for GradientAngle {
         let area = Rectangle::from_loc_and_size((a, b), size);
 
         [BorderRenderElement::new(
-            area,
-            area,
+            area.size,
+            Rectangle::from_loc_and_size((0, 0), area.size),
             [1., 0., 0., 1.],
             [0., 1., 0., 1.],
             self.angle - FRAC_PI_2,
-            area,
+            Rectangle::from_loc_and_size((0, 0), area.size),
             0.,
             CornerRadius::default(),
-        )]
+        )
+        .with_location(area.loc)]
         .into_iter()
         .map(|elem| Box::new(elem) as _)
         .collect()
diff --git a/niri-visual-tests/src/cases/gradient_area.rs b/niri-visual-tests/src/cases/gradient_area.rs
index 2d271666..e11cf828 100644
--- a/niri-visual-tests/src/cases/gradient_area.rs
+++ b/niri-visual-tests/src/cases/gradient_area.rs
@@ -83,7 +83,8 @@ impl TestCase for GradientArea {
             (size.h as f32 / 8. + size.h as f32 / 8. * 7. * f).round() as i32,
         ));
         let g_loc = ((size.w - g_size.w) / 2, (size.h - g_size.h) / 2);
-        let g_area = Rectangle::from_loc_and_size(g_loc, g_size);
+        let mut g_area = Rectangle::from_loc_and_size(g_loc, g_size);
+        g_area.loc -= area.loc;
 
         self.border.update(g_size, true, CornerRadius::default());
         rv.extend(
@@ -99,15 +100,16 @@ impl TestCase for GradientArea {
 
         rv.extend(
             [BorderRenderElement::new(
-                area,
+                area.size,
                 g_area,
                 [1., 0., 0., 1.],
                 [0., 1., 0., 1.],
                 FRAC_PI_4,
-                area,
+                Rectangle::from_loc_and_size((0, 0), rect_size),
                 0.,
                 CornerRadius::default(),
-            )]
+            )
+            .with_location(area.loc)]
             .into_iter()
             .map(|elem| Box::new(elem) as _),
         );