From 0b5028b1ab47707a469176e9bf20cacdd3a19861 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sun, 19 Apr 2020 14:39:30 +0200
Subject: Draft `Program` interactivity for `Canvas`

---
 core/src/rectangle.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'core/src/rectangle.rs')

diff --git a/core/src/rectangle.rs b/core/src/rectangle.rs
index aead6e9a..db8ebfc8 100644
--- a/core/src/rectangle.rs
+++ b/core/src/rectangle.rs
@@ -1,4 +1,4 @@
-use crate::Point;
+use crate::{Point, Size};
 
 /// A rectangle.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
@@ -43,6 +43,14 @@ impl Rectangle<f32> {
         self.y + self.height / 2.0
     }
 
+    /// Returns the [`Size`] of the [`Rectangle`].
+    ///
+    /// [`Size`]: struct.Size.html
+    /// [`Rectangle`]: struct.Rectangle.html
+    pub fn size(&self) -> Size {
+        Size::new(self.width, self.height)
+    }
+
     /// Returns true if the given [`Point`] is contained in the [`Rectangle`].
     ///
     /// [`Point`]: struct.Point.html
-- 
cgit 


From 5d5e60a5cc647b3227f78e1f3a3b31b2c27a3cc7 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 28 Apr 2020 04:39:59 +0200
Subject: Implement `Rectangle::new`

---
 core/src/rectangle.rs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'core/src/rectangle.rs')

diff --git a/core/src/rectangle.rs b/core/src/rectangle.rs
index db8ebfc8..b9d0d5d2 100644
--- a/core/src/rectangle.rs
+++ b/core/src/rectangle.rs
@@ -17,6 +17,21 @@ pub struct Rectangle<T = f32> {
 }
 
 impl Rectangle<f32> {
+    /// Creates a new [`Rectangle`] with its top-left corner in the given
+    /// [`Point`] and with the provided [`Size`].
+    ///
+    /// [`Rectangle`]: struct.Rectangle.html
+    /// [`Point`]: struct.Point.html
+    /// [`Size`]: struct.Size.html
+    pub fn new(top_left: Point, size: Size) -> Self {
+        Self {
+            x: top_left.x,
+            y: top_left.y,
+            width: size.width,
+            height: size.height,
+        }
+    }
+
     /// Returns the [`Point`] at the center of the [`Rectangle`].
     ///
     /// [`Point`]: struct.Point.html
-- 
cgit 


From 69c60d372c18c20856f733efd337ac302b7de926 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 28 Apr 2020 04:40:23 +0200
Subject: Implement `std::ops::Add<Vector>` for `Rectangle`

---
 core/src/rectangle.rs | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'core/src/rectangle.rs')

diff --git a/core/src/rectangle.rs b/core/src/rectangle.rs
index b9d0d5d2..87046df4 100644
--- a/core/src/rectangle.rs
+++ b/core/src/rectangle.rs
@@ -1,4 +1,4 @@
-use crate::{Point, Size};
+use crate::{Point, Size, Vector};
 
 /// A rectangle.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
@@ -140,3 +140,18 @@ impl From<Rectangle<f32>> for Rectangle<u32> {
         }
     }
 }
+
+impl<T> std::ops::Add<Vector<T>> for Rectangle<T>
+where
+    T: std::ops::Add<Output = T>,
+{
+    type Output = Rectangle<T>;
+
+    fn add(self, translation: Vector<T>) -> Self {
+        Rectangle {
+            x: self.x + translation.x,
+            y: self.y + translation.y,
+            ..self
+        }
+    }
+}
-- 
cgit 


From 2539042b71d70afd4d8f262783d441e768811ee9 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 28 Apr 2020 06:24:12 +0200
Subject: Remove `Drawable` and rename `State` to `Program`

---
 core/src/rectangle.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'core/src/rectangle.rs')

diff --git a/core/src/rectangle.rs b/core/src/rectangle.rs
index 87046df4..e8d0538a 100644
--- a/core/src/rectangle.rs
+++ b/core/src/rectangle.rs
@@ -135,8 +135,8 @@ impl From<Rectangle<f32>> for Rectangle<u32> {
         Rectangle {
             x: rectangle.x as u32,
             y: rectangle.y as u32,
-            width: rectangle.width.ceil() as u32,
-            height: rectangle.height.ceil() as u32,
+            width: (rectangle.width + 0.5).round() as u32,
+            height: (rectangle.height + 0.5).round() as u32,
         }
     }
 }
-- 
cgit 


From 475a2779a7a420ed6c1567a8dbc623114e2b7ec0 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 29 Apr 2020 03:23:08 +0200
Subject: Implement `Rectangle::with_size`

---
 core/src/rectangle.rs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'core/src/rectangle.rs')

diff --git a/core/src/rectangle.rs b/core/src/rectangle.rs
index e8d0538a..6f953137 100644
--- a/core/src/rectangle.rs
+++ b/core/src/rectangle.rs
@@ -32,6 +32,20 @@ impl Rectangle<f32> {
         }
     }
 
+    /// Creates a new [`Rectangle`] with its top-left corner at the origin
+    /// and with the provided [`Size`].
+    ///
+    /// [`Rectangle`]: struct.Rectangle.html
+    /// [`Size`]: struct.Size.html
+    pub fn with_size(size: Size) -> Self {
+        Self {
+            x: 0.0,
+            y: 0.0,
+            width: size.width,
+            height: size.height,
+        }
+    }
+
     /// Returns the [`Point`] at the center of the [`Rectangle`].
     ///
     /// [`Point`]: struct.Point.html
-- 
cgit 


From afa0bca4fd1a5499fd24549eb49a44f9837597c6 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 29 Apr 2020 08:25:27 +0200
Subject: Implement `Rectangle::position`

---
 core/src/rectangle.rs | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'core/src/rectangle.rs')

diff --git a/core/src/rectangle.rs b/core/src/rectangle.rs
index 6f953137..8bc89a44 100644
--- a/core/src/rectangle.rs
+++ b/core/src/rectangle.rs
@@ -72,6 +72,13 @@ impl Rectangle<f32> {
         self.y + self.height / 2.0
     }
 
+    /// Returns the position of the top left corner of the [`Rectangle`].
+    ///
+    /// [`Rectangle`]: struct.Rectangle.html
+    pub fn position(&self) -> Point {
+        Point::new(self.x, self.y)
+    }
+
     /// Returns the [`Size`] of the [`Rectangle`].
     ///
     /// [`Size`]: struct.Size.html
-- 
cgit