Migrate to new Rectangle functions

15 files changed, 54 insertions, 54 deletions

diff --git a/niri-visual-tests/src/cases/gradient_angle.rs b/niri-visual-tests/src/cases/gradient_angle.rs
index 39a2e4ef..807e7aa6 100644
--- a/niri-visual-tests/src/cases/gradient_angle.rs
+++ b/niri-visual-tests/src/cases/gradient_angle.rs
@@ -5,7 +5,7 @@ use niri::render_helpers::border::BorderRenderElement;
 use niri_config::{Color, CornerRadius, GradientInterpolation};
 use smithay::backend::renderer::element::RenderElement;
 use smithay::backend::renderer::gles::GlesRenderer;
-use smithay::utils::{Physical, Rectangle, Size};
+use smithay::utils::{Physical, Point, Rectangle, Size};
 
 use super::{Args, TestCase};
 
@@ -50,16 +50,16 @@ impl TestCase for GradientAngle {
     ) -> Vec<Box<dyn RenderElement<GlesRenderer>>> {
         let (a, b) = (size.w / 4, size.h / 4);
         let size = (size.w - a * 2, size.h - b * 2);
-        let area = Rectangle::from_loc_and_size((a, b), size).to_f64();
+        let area = Rectangle::new(Point::from((a, b)), Size::from(size)).to_f64();
 
         [BorderRenderElement::new(
             area.size,
-            Rectangle::from_loc_and_size((0., 0.), area.size),
+            Rectangle::from_size(area.size),
             GradientInterpolation::default(),
             Color::new_unpremul(1., 0., 0., 1.),
             Color::new_unpremul(0., 1., 0., 1.),
             self.angle - FRAC_PI_2,
-            Rectangle::from_loc_and_size((0., 0.), area.size),
+            Rectangle::from_size(area.size),
             0.,
             CornerRadius::default(),
             1.,
diff --git a/niri-visual-tests/src/cases/gradient_area.rs b/niri-visual-tests/src/cases/gradient_area.rs
index 6f0cf4f3..73b71ce9 100644
--- a/niri-visual-tests/src/cases/gradient_area.rs
+++ b/niri-visual-tests/src/cases/gradient_area.rs
@@ -65,8 +65,8 @@ impl TestCase for GradientArea {
         let f = (self.progress.sin() + 1.) / 2.;
 
         let (a, b) = (size.w / 4, size.h / 4);
-        let rect_size = (size.w - a * 2, size.h - b * 2);
-        let area = Rectangle::from_loc_and_size((a, b), rect_size).to_f64();
+        let rect_size = Size::from((size.w - a * 2, size.h - b * 2));
+        let area = Rectangle::new(Point::from((a, b)), rect_size).to_f64();
 
         let g_size = Size::from((
             (size.w as f32 / 8. + size.w as f32 / 8. * 7. * f).round() as i32,
@@ -74,7 +74,7 @@ impl TestCase for GradientArea {
         ));
         let g_loc = Point::from(((size.w - g_size.w) / 2, (size.h - g_size.h) / 2)).to_f64();
         let g_size = g_size.to_f64();
-        let mut g_area = Rectangle::from_loc_and_size(g_loc, g_size);
+        let mut g_area = Rectangle::new(g_loc, g_size);
         g_area.loc -= area.loc;
 
         self.border.update_render_elements(
@@ -99,7 +99,7 @@ impl TestCase for GradientArea {
                 Color::new_unpremul(1., 0., 0., 1.),
                 Color::new_unpremul(0., 1., 0., 1.),
                 FRAC_PI_4,
-                Rectangle::from_loc_and_size((0, 0), rect_size).to_f64(),
+                Rectangle::from_size(rect_size).to_f64(),
                 0.,
                 CornerRadius::default(),
                 1.,
diff --git a/niri-visual-tests/src/cases/gradient_oklab.rs b/niri-visual-tests/src/cases/gradient_oklab.rs
index eac2aaf0..8230be99 100644
--- a/niri-visual-tests/src/cases/gradient_oklab.rs
+++ b/niri-visual-tests/src/cases/gradient_oklab.rs
@@ -4,7 +4,7 @@ use niri_config::{
 };
 use smithay::backend::renderer::element::RenderElement;
 use smithay::backend::renderer::gles::GlesRenderer;
-use smithay::utils::{Physical, Rectangle, Size};
+use smithay::utils::{Physical, Point, Rectangle, Size};
 
 use super::{Args, TestCase};
 
@@ -31,16 +31,16 @@ impl TestCase for GradientOklab {
     ) -> Vec<Box<dyn RenderElement<GlesRenderer>>> {
         let (a, b) = (size.w / 6, size.h / 3);
         let size = (size.w - a * 2, size.h - b * 2);
-        let area = Rectangle::from_loc_and_size((a, b), size).to_f64();
+        let area = Rectangle::new(Point::from((a, b)), Size::from(size)).to_f64();
 
         [BorderRenderElement::new(
             area.size,
-            Rectangle::from_loc_and_size((0., 0.), area.size),
+            Rectangle::from_size(area.size),
             self.gradient_format,
             Color::new_unpremul(1., 0., 0., 1.),
             Color::new_unpremul(0., 1., 0., 1.),
             0.,
-            Rectangle::from_loc_and_size((0., 0.), area.size),
+            Rectangle::from_size(area.size),
             0.,
             CornerRadius::default(),
             1.,
diff --git a/niri-visual-tests/src/cases/gradient_oklab_alpha.rs b/niri-visual-tests/src/cases/gradient_oklab_alpha.rs
index e9bdcf17..372bfb47 100644
--- a/niri-visual-tests/src/cases/gradient_oklab_alpha.rs
+++ b/niri-visual-tests/src/cases/gradient_oklab_alpha.rs
@@ -2,7 +2,7 @@ use niri::render_helpers::border::BorderRenderElement;
 use niri_config::{Color, CornerRadius, GradientColorSpace, GradientInterpolation};
 use smithay::backend::renderer::element::RenderElement;
 use smithay::backend::renderer::gles::GlesRenderer;
-use smithay::utils::{Physical, Rectangle, Size};
+use smithay::utils::{Physical, Point, Rectangle, Size};
 
 use super::{Args, TestCase};
 
@@ -29,16 +29,16 @@ impl TestCase for GradientOklabAlpha {
     ) -> Vec<Box<dyn RenderElement<GlesRenderer>>> {
         let (a, b) = (size.w / 6, size.h / 3);
         let size = (size.w - a * 2, size.h - b * 2);
-        let area = Rectangle::from_loc_and_size((a, b), size).to_f64();
+        let area = Rectangle::new(Point::from((a, b)), Size::from(size)).to_f64();
 
         [BorderRenderElement::new(
             area.size,
-            Rectangle::from_loc_and_size((0., 0.), area.size),
+            Rectangle::from_size(area.size),
             self.gradient_format,
             Color::new_unpremul(1., 0., 0., 1.),
             Color::new_unpremul(0., 1., 0., 0.),
             0.,
-            Rectangle::from_loc_and_size((0., 0.), area.size),
+            Rectangle::from_size(area.size),
             0.,
             CornerRadius::default(),
             1.,
diff --git a/niri-visual-tests/src/cases/gradient_oklch_alpha.rs b/niri-visual-tests/src/cases/gradient_oklch_alpha.rs
index 695dc2b8..0c649b0d 100644
--- a/niri-visual-tests/src/cases/gradient_oklch_alpha.rs
+++ b/niri-visual-tests/src/cases/gradient_oklch_alpha.rs
@@ -4,7 +4,7 @@ use niri_config::{
 };
 use smithay::backend::renderer::element::RenderElement;
 use smithay::backend::renderer::gles::GlesRenderer;
-use smithay::utils::{Physical, Rectangle, Size};
+use smithay::utils::{Physical, Point, Rectangle, Size};
 
 use super::{Args, TestCase};
 
@@ -31,16 +31,16 @@ impl TestCase for GradientOklchAlpha {
     ) -> Vec<Box<dyn RenderElement<GlesRenderer>>> {
         let (a, b) = (size.w / 6, size.h / 3);
         let size = (size.w - a * 2, size.h - b * 2);
-        let area = Rectangle::from_loc_and_size((a, b), size).to_f64();
+        let area = Rectangle::new(Point::from((a, b)), Size::from(size)).to_f64();
 
         [BorderRenderElement::new(
             area.size,
-            Rectangle::from_loc_and_size((0., 0.), area.size),
+            Rectangle::from_size(area.size),
             self.gradient_format,
             Color::new_unpremul(1., 0., 0., 1.),
             Color::new_unpremul(0., 1., 0., 0.),
             0.,
-            Rectangle::from_loc_and_size((0., 0.), area.size),
+            Rectangle::from_size(area.size),
             0.,
             CornerRadius::default(),
             1.,
diff --git a/niri-visual-tests/src/cases/gradient_oklch_decreasing.rs b/niri-visual-tests/src/cases/gradient_oklch_decreasing.rs
index 208dd9b0..b693e032 100644
--- a/niri-visual-tests/src/cases/gradient_oklch_decreasing.rs
+++ b/niri-visual-tests/src/cases/gradient_oklch_decreasing.rs
@@ -4,7 +4,7 @@ use niri_config::{
 };
 use smithay::backend::renderer::element::RenderElement;
 use smithay::backend::renderer::gles::GlesRenderer;
-use smithay::utils::{Physical, Rectangle, Size};
+use smithay::utils::{Physical, Point, Rectangle, Size};
 
 use super::{Args, TestCase};
 
@@ -31,16 +31,16 @@ impl TestCase for GradientOklchDecreasing {
     ) -> Vec<Box<dyn RenderElement<GlesRenderer>>> {
         let (a, b) = (size.w / 6, size.h / 3);
         let size = (size.w - a * 2, size.h - b * 2);
-        let area = Rectangle::from_loc_and_size((a, b), size).to_f64();
+        let area = Rectangle::new(Point::from((a, b)), Size::from(size)).to_f64();
 
         [BorderRenderElement::new(
             area.size,
-            Rectangle::from_loc_and_size((0., 0.), area.size),
+            Rectangle::from_size(area.size),
             self.gradient_format,
             Color::new_unpremul(1., 0., 0., 1.),
             Color::new_unpremul(0., 1., 0., 1.),
             0.,
-            Rectangle::from_loc_and_size((0., 0.), area.size),
+            Rectangle::from_size(area.size),
             0.,
             CornerRadius::default(),
             1.,
diff --git a/niri-visual-tests/src/cases/gradient_oklch_increasing.rs b/niri-visual-tests/src/cases/gradient_oklch_increasing.rs
index 92beca2c..e562f170 100644
--- a/niri-visual-tests/src/cases/gradient_oklch_increasing.rs
+++ b/niri-visual-tests/src/cases/gradient_oklch_increasing.rs
@@ -4,7 +4,7 @@ use niri_config::{
 };
 use smithay::backend::renderer::element::RenderElement;
 use smithay::backend::renderer::gles::GlesRenderer;
-use smithay::utils::{Physical, Rectangle, Size};
+use smithay::utils::{Physical, Point, Rectangle, Size};
 
 use super::{Args, TestCase};
 
@@ -31,16 +31,16 @@ impl TestCase for GradientOklchIncreasing {
     ) -> Vec<Box<dyn RenderElement<GlesRenderer>>> {
         let (a, b) = (size.w / 6, size.h / 3);
         let size = (size.w - a * 2, size.h - b * 2);
-        let area = Rectangle::from_loc_and_size((a, b), size).to_f64();
+        let area = Rectangle::new(Point::from((a, b)), Size::from(size)).to_f64();
 
         [BorderRenderElement::new(
             area.size,
-            Rectangle::from_loc_and_size((0., 0.), area.size),
+            Rectangle::from_size(area.size),
             self.gradient_format,
             Color::new_unpremul(1., 0., 0., 1.),
             Color::new_unpremul(0., 1., 0., 1.),
             0.,
-            Rectangle::from_loc_and_size((0., 0.), area.size),
+            Rectangle::from_size(area.size),
             0.,
             CornerRadius::default(),
             1.,
diff --git a/niri-visual-tests/src/cases/gradient_oklch_longer.rs b/niri-visual-tests/src/cases/gradient_oklch_longer.rs
index 924d56ce..bb3c5de0 100644
--- a/niri-visual-tests/src/cases/gradient_oklch_longer.rs
+++ b/niri-visual-tests/src/cases/gradient_oklch_longer.rs
@@ -4,7 +4,7 @@ use niri_config::{
 };
 use smithay::backend::renderer::element::RenderElement;
 use smithay::backend::renderer::gles::GlesRenderer;
-use smithay::utils::{Physical, Rectangle, Size};
+use smithay::utils::{Physical, Point, Rectangle, Size};
 
 use super::{Args, TestCase};
 
@@ -31,16 +31,16 @@ impl TestCase for GradientOklchLonger {
     ) -> Vec<Box<dyn RenderElement<GlesRenderer>>> {
         let (a, b) = (size.w / 6, size.h / 3);
         let size = (size.w - a * 2, size.h - b * 2);
-        let area = Rectangle::from_loc_and_size((a, b), size).to_f64();
+        let area = Rectangle::new(Point::from((a, b)), Size::from(size)).to_f64();
 
         [BorderRenderElement::new(
             area.size,
-            Rectangle::from_loc_and_size((0., 0.), area.size),
+            Rectangle::from_size(area.size),
             self.gradient_format,
             Color::new_unpremul(1., 0., 0., 1.),
             Color::new_unpremul(0., 1., 0., 1.),
             0.,
-            Rectangle::from_loc_and_size((0., 0.), area.size),
+            Rectangle::from_size(area.size),
             0.,
             CornerRadius::default(),
             1.,
diff --git a/niri-visual-tests/src/cases/gradient_oklch_shorter.rs b/niri-visual-tests/src/cases/gradient_oklch_shorter.rs
index fec62af3..d0103f30 100644
--- a/niri-visual-tests/src/cases/gradient_oklch_shorter.rs
+++ b/niri-visual-tests/src/cases/gradient_oklch_shorter.rs
@@ -4,7 +4,7 @@ use niri_config::{
 };
 use smithay::backend::renderer::element::RenderElement;
 use smithay::backend::renderer::gles::GlesRenderer;
-use smithay::utils::{Physical, Rectangle, Size};
+use smithay::utils::{Physical, Point, Rectangle, Size};
 
 use super::{Args, TestCase};
 
@@ -31,16 +31,16 @@ impl TestCase for GradientOklchShorter {
     ) -> Vec<Box<dyn RenderElement<GlesRenderer>>> {
         let (a, b) = (size.w / 6, size.h / 3);
         let size = (size.w - a * 2, size.h - b * 2);
-        let area = Rectangle::from_loc_and_size((a, b), size).to_f64();
+        let area = Rectangle::new(Point::from((a, b)), Size::from(size)).to_f64();
 
         [BorderRenderElement::new(
             area.size,
-            Rectangle::from_loc_and_size((0., 0.), area.size),
+            Rectangle::from_size(area.size),
             self.gradient_format,
             Color::new_unpremul(1., 0., 0., 1.),
             Color::new_unpremul(0., 1., 0., 1.),
             0.,
-            Rectangle::from_loc_and_size((0., 0.), area.size),
+            Rectangle::from_size(area.size),
             0.,
             CornerRadius::default(),
             1.,
diff --git a/niri-visual-tests/src/cases/gradient_srgb.rs b/niri-visual-tests/src/cases/gradient_srgb.rs
index a3182b80..6e704e29 100644
--- a/niri-visual-tests/src/cases/gradient_srgb.rs
+++ b/niri-visual-tests/src/cases/gradient_srgb.rs
@@ -4,7 +4,7 @@ use niri_config::{
 };
 use smithay::backend::renderer::element::RenderElement;
 use smithay::backend::renderer::gles::GlesRenderer;
-use smithay::utils::{Physical, Rectangle, Size};
+use smithay::utils::{Physical, Point, Rectangle, Size};
 
 use super::{Args, TestCase};
 
@@ -31,16 +31,16 @@ impl TestCase for GradientSrgb {
     ) -> Vec<Box<dyn RenderElement<GlesRenderer>>> {
         let (a, b) = (size.w / 6, size.h / 3);
         let size = (size.w - a * 2, size.h - b * 2);
-        let area = Rectangle::from_loc_and_size((a, b), size).to_f64();
+        let area = Rectangle::new(Point::from((a, b)), Size::from(size)).to_f64();
 
         [BorderRenderElement::new(
             area.size,
-            Rectangle::from_loc_and_size((0., 0.), area.size),
+            Rectangle::from_size(area.size),
             self.gradient_format,
             Color::new_unpremul(1., 0., 0., 1.),
             Color::new_unpremul(0., 1., 0., 1.),
             0.,
-            Rectangle::from_loc_and_size((0., 0.), area.size),
+            Rectangle::from_size(area.size),
             0.,
             CornerRadius::default(),
             1.,
diff --git a/niri-visual-tests/src/cases/gradient_srgb_alpha.rs b/niri-visual-tests/src/cases/gradient_srgb_alpha.rs
index f4542e79..237bfad4 100644
--- a/niri-visual-tests/src/cases/gradient_srgb_alpha.rs
+++ b/niri-visual-tests/src/cases/gradient_srgb_alpha.rs
@@ -2,7 +2,7 @@ use niri::render_helpers::border::BorderRenderElement;
 use niri_config::{Color, CornerRadius, GradientColorSpace, GradientInterpolation};
 use smithay::backend::renderer::element::RenderElement;
 use smithay::backend::renderer::gles::GlesRenderer;
-use smithay::utils::{Physical, Rectangle, Size};
+use smithay::utils::{Physical, Point, Rectangle, Size};
 
 use super::{Args, TestCase};
 
@@ -29,16 +29,16 @@ impl TestCase for GradientSrgbAlpha {
     ) -> Vec<Box<dyn RenderElement<GlesRenderer>>> {
         let (a, b) = (size.w / 6, size.h / 3);
         let size = (size.w - a * 2, size.h - b * 2);
-        let area = Rectangle::from_loc_and_size((a, b), size).to_f64();
+        let area = Rectangle::new(Point::from((a, b)), Size::from(size)).to_f64();
 
         [BorderRenderElement::new(
             area.size,
-            Rectangle::from_loc_and_size((0., 0.), area.size),
+            Rectangle::from_size(area.size),
             self.gradient_format,
             Color::new_unpremul(1., 0., 0., 1.),
             Color::new_unpremul(0., 1., 0., 0.),
             0.,
-            Rectangle::from_loc_and_size((0., 0.), area.size),
+            Rectangle::from_size(area.size),
             0.,
             CornerRadius::default(),
             1.,
diff --git a/niri-visual-tests/src/cases/gradient_srgblinear.rs b/niri-visual-tests/src/cases/gradient_srgblinear.rs
index dc18ce82..a154971c 100644
--- a/niri-visual-tests/src/cases/gradient_srgblinear.rs
+++ b/niri-visual-tests/src/cases/gradient_srgblinear.rs
@@ -4,7 +4,7 @@ use niri_config::{
 };
 use smithay::backend::renderer::element::RenderElement;
 use smithay::backend::renderer::gles::GlesRenderer;
-use smithay::utils::{Physical, Rectangle, Size};
+use smithay::utils::{Physical, Point, Rectangle, Size};
 
 use super::{Args, TestCase};
 
@@ -31,16 +31,16 @@ impl TestCase for GradientSrgbLinear {
     ) -> Vec<Box<dyn RenderElement<GlesRenderer>>> {
         let (a, b) = (size.w / 6, size.h / 3);
         let size = (size.w - a * 2, size.h - b * 2);
-        let area = Rectangle::from_loc_and_size((a, b), size).to_f64();
+        let area = Rectangle::new(Point::from((a, b)), Size::from(size)).to_f64();
 
         [BorderRenderElement::new(
             area.size,
-            Rectangle::from_loc_and_size((0., 0.), area.size),
+            Rectangle::from_size(area.size),
             self.gradient_format,
             Color::new_unpremul(1., 0., 0., 1.),
             Color::new_unpremul(0., 1., 0., 1.),
             0.,
-            Rectangle::from_loc_and_size((0., 0.), area.size),
+            Rectangle::from_size(area.size),
             0.,
             CornerRadius::default(),
             1.,
diff --git a/niri-visual-tests/src/cases/gradient_srgblinear_alpha.rs b/niri-visual-tests/src/cases/gradient_srgblinear_alpha.rs
index 3c73dc7c..847b3a6b 100644
--- a/niri-visual-tests/src/cases/gradient_srgblinear_alpha.rs
+++ b/niri-visual-tests/src/cases/gradient_srgblinear_alpha.rs
@@ -2,7 +2,7 @@ use niri::render_helpers::border::BorderRenderElement;
 use niri_config::{Color, CornerRadius, GradientColorSpace, GradientInterpolation};
 use smithay::backend::renderer::element::RenderElement;
 use smithay::backend::renderer::gles::GlesRenderer;
-use smithay::utils::{Physical, Rectangle, Size};
+use smithay::utils::{Physical, Point, Rectangle, Size};
 
 use super::{Args, TestCase};
 
@@ -29,16 +29,16 @@ impl TestCase for GradientSrgbLinearAlpha {
     ) -> Vec<Box<dyn RenderElement<GlesRenderer>>> {
         let (a, b) = (size.w / 6, size.h / 3);
         let size = (size.w - a * 2, size.h - b * 2);
-        let area = Rectangle::from_loc_and_size((a, b), size).to_f64();
+        let area = Rectangle::new(Point::from((a, b)), Size::from(size)).to_f64();
 
         [BorderRenderElement::new(
             area.size,
-            Rectangle::from_loc_and_size((0., 0.), area.size),
+            Rectangle::from_size(area.size),
             self.gradient_format,
             Color::new_unpremul(1., 0., 0., 1.),
             Color::new_unpremul(0., 1., 0., 0.),
             0.,
-            Rectangle::from_loc_and_size((0., 0.), area.size),
+            Rectangle::from_size(area.size),
             0.,
             CornerRadius::default(),
             1.,
diff --git a/niri-visual-tests/src/cases/tile.rs b/niri-visual-tests/src/cases/tile.rs
index 0be80054..4bef6e40 100644
--- a/niri-visual-tests/src/cases/tile.rs
+++ b/niri-visual-tests/src/cases/tile.rs
@@ -114,7 +114,7 @@ impl TestCase for Tile {
 
         self.tile.update(
             true,
-            Rectangle::from_loc_and_size((-location.x, -location.y), size.to_logical(1.)),
+            Rectangle::new(Point::from((-location.x, -location.y)), size.to_logical(1.)),
         );
         self.tile
             .render(
diff --git a/niri-visual-tests/src/smithay_view.rs b/niri-visual-tests/src/smithay_view.rs
index 416729f0..7b8e77ee 100644
--- a/niri-visual-tests/src/smithay_view.rs
+++ b/niri-visual-tests/src/smithay_view.rs
@@ -145,7 +145,7 @@ mod imp {
 
             case.advance_animations(self.clock.borrow_mut().now());
 
-            let rect: Rectangle<i32, Physical> = Rectangle::from_loc_and_size((0, 0), size);
+            let rect: Rectangle<i32, Physical> = Rectangle::from_size(Size::from(size));
 
             let elements = unsafe {
                 with_framebuffer_save_restore(renderer, |renderer| {