From 09a6bcfffc24f5abdc8709403bab7ae1e01563f1 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Thu, 2 May 2024 13:15:17 +0200
Subject: Add `Image` rotation support

Co-authored-by: DKolter <68352124+DKolter@users.noreply.github.com>
---
 graphics/src/image.rs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

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

diff --git a/graphics/src/image.rs b/graphics/src/image.rs
index 04c45057..083248bf 100644
--- a/graphics/src/image.rs
+++ b/graphics/src/image.rs
@@ -2,9 +2,7 @@
 #[cfg(feature = "image")]
 pub use ::image as image_rs;
 
-use crate::core::image;
-use crate::core::svg;
-use crate::core::{Color, Rectangle};
+use crate::core::{image, svg, Color, Rectangle, Size};
 
 /// A raster or vector image.
 #[derive(Debug, Clone, PartialEq)]
@@ -19,6 +17,12 @@ pub enum Image {
 
         /// The bounds of the image.
         bounds: Rectangle,
+
+        /// The rotation of the image in radians
+        rotation: f32,
+
+        /// The scale of the image after rotation
+        scale: Size,
     },
     /// A vector image.
     Vector {
@@ -30,6 +34,12 @@ pub enum Image {
 
         /// The bounds of the image.
         bounds: Rectangle,
+
+        /// The rotation of the image in radians
+        rotation: f32,
+
+        /// The scale of the image after rotation
+        scale: Size,
     },
 }
 
-- 
cgit 


From a57313b23ecb9843856ca0ea08635b6121fcb2cb Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Thu, 2 May 2024 15:21:22 +0200
Subject: Simplify image rotation API and its internals

---
 graphics/src/image.rs | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

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

diff --git a/graphics/src/image.rs b/graphics/src/image.rs
index 083248bf..4fd6998d 100644
--- a/graphics/src/image.rs
+++ b/graphics/src/image.rs
@@ -2,7 +2,7 @@
 #[cfg(feature = "image")]
 pub use ::image as image_rs;
 
-use crate::core::{image, svg, Color, Rectangle, Size};
+use crate::core::{image, svg, Color, Radians, Rectangle};
 
 /// A raster or vector image.
 #[derive(Debug, Clone, PartialEq)]
@@ -19,10 +19,7 @@ pub enum Image {
         bounds: Rectangle,
 
         /// The rotation of the image in radians
-        rotation: f32,
-
-        /// The scale of the image after rotation
-        scale: Size,
+        rotation: Radians,
     },
     /// A vector image.
     Vector {
@@ -36,10 +33,7 @@ pub enum Image {
         bounds: Rectangle,
 
         /// The rotation of the image in radians
-        rotation: f32,
-
-        /// The scale of the image after rotation
-        scale: Size,
+        rotation: Radians,
     },
 }
 
-- 
cgit 


From eac5bcb64f17dfbb52b64ea4f95693462986bb69 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Fri, 3 May 2024 07:04:57 +0200
Subject: Fix `Image::bounds` when rotation present in `iced_graphics`

---
 graphics/src/image.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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

diff --git a/graphics/src/image.rs b/graphics/src/image.rs
index 4fd6998d..9d09bf4c 100644
--- a/graphics/src/image.rs
+++ b/graphics/src/image.rs
@@ -41,9 +41,12 @@ impl Image {
     /// Returns the bounds of the [`Image`].
     pub fn bounds(&self) -> Rectangle {
         match self {
-            Image::Raster { bounds, .. } | Image::Vector { bounds, .. } => {
-                *bounds
+            Image::Raster {
+                bounds, rotation, ..
             }
+            | Image::Vector {
+                bounds, rotation, ..
+            } => bounds.rotate(*rotation),
         }
     }
 }
-- 
cgit