From 21cade908a82f8ff63005ad7b12fbc1b76bd1e52 Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Wed, 19 Apr 2023 10:33:26 +0100
Subject: [PATCH 1/4] Added `register_type` for `UiImageSize` to the `UiPlugin`

---
 crates/bevy_ui/src/lib.rs          | 2 ++
 crates/bevy_ui/src/widget/image.rs | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/crates/bevy_ui/src/lib.rs b/crates/bevy_ui/src/lib.rs
index 7d29d859d18d7..c6a713fce4f0f 100644
--- a/crates/bevy_ui/src/lib.rs
+++ b/crates/bevy_ui/src/lib.rs
@@ -28,6 +28,7 @@ pub use layout::*;
 pub use measurement::*;
 pub use render::*;
 pub use ui_node::*;
+use widget::UiImageSize;
 
 #[doc(hidden)]
 pub mod prelude {
@@ -113,6 +114,7 @@ impl Plugin for UiPlugin {
             .register_type::<Style>()
             .register_type::<BackgroundColor>()
             .register_type::<UiImage>()
+            .register_type::<UiImageSize>()
             .register_type::<Val>()
             .register_type::<widget::Button>()
             .register_type::<widget::Label>()
diff --git a/crates/bevy_ui/src/widget/image.rs b/crates/bevy_ui/src/widget/image.rs
index 09ddeceebc6c5..7b06a0b7fff4d 100644
--- a/crates/bevy_ui/src/widget/image.rs
+++ b/crates/bevy_ui/src/widget/image.rs
@@ -8,6 +8,7 @@ use bevy_ecs::{
     system::{Query, Res},
 };
 use bevy_math::Vec2;
+use bevy_reflect::Reflect;
 use bevy_render::texture::Image;
 #[cfg(feature = "bevy_text")]
 use bevy_text::Text;
@@ -15,7 +16,7 @@ use bevy_text::Text;
 /// The size of the image in pixels
 ///
 /// This field is set automatically
-#[derive(Component, Copy, Clone, Debug, Default)]
+#[derive(Component, Copy, Clone, Debug, Default, Reflect)]
 pub struct UiImageSize {
     size: Vec2,
 }

From eba95a3f3ba2d21fbdce7c1e16ef5f1cfafee773 Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Wed, 19 Apr 2023 22:45:36 +0100
Subject: [PATCH 2/4] Added `FromReflect` derive and `reflect` attribute

---
 crates/bevy_ui/src/widget/image.rs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/crates/bevy_ui/src/widget/image.rs b/crates/bevy_ui/src/widget/image.rs
index 7b06a0b7fff4d..7f194a243258f 100644
--- a/crates/bevy_ui/src/widget/image.rs
+++ b/crates/bevy_ui/src/widget/image.rs
@@ -5,18 +5,19 @@ use bevy_ecs::query::Without;
 use bevy_ecs::{
     prelude::Component,
     query::With,
-    system::{Query, Res},
+    system::{Query, Res}, reflect::ReflectComponent,
 };
 use bevy_math::Vec2;
-use bevy_reflect::Reflect;
+use bevy_reflect::{Reflect, std_traits::ReflectDefault, FromReflect};
 use bevy_render::texture::Image;
 #[cfg(feature = "bevy_text")]
 use bevy_text::Text;
 
-/// The size of the image in pixels
+/// The size of the image in physical pixels
 ///
-/// This field is set automatically
-#[derive(Component, Copy, Clone, Debug, Default, Reflect)]
+/// This field is set automatically by `update_image_calculated_size_system`
+#[derive(Component, Debug, Copy, Clone, Default, Reflect, FromReflect)]
+#[reflect(Component, Default)]
 pub struct UiImageSize {
     size: Vec2,
 }

From 32457c99927c2467bff1aaba1554e7279d732594 Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Thu, 20 Apr 2023 11:08:29 +0100
Subject: [PATCH 3/4] reflect `FromReflect`

---
 crates/bevy_ui/src/widget/image.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/bevy_ui/src/widget/image.rs b/crates/bevy_ui/src/widget/image.rs
index 7f194a243258f..b7b2d351533bb 100644
--- a/crates/bevy_ui/src/widget/image.rs
+++ b/crates/bevy_ui/src/widget/image.rs
@@ -8,7 +8,7 @@ use bevy_ecs::{
     system::{Query, Res}, reflect::ReflectComponent,
 };
 use bevy_math::Vec2;
-use bevy_reflect::{Reflect, std_traits::ReflectDefault, FromReflect};
+use bevy_reflect::{Reflect, std_traits::ReflectDefault, FromReflect, ReflectFromReflect};
 use bevy_render::texture::Image;
 #[cfg(feature = "bevy_text")]
 use bevy_text::Text;
@@ -17,7 +17,7 @@ use bevy_text::Text;
 ///
 /// This field is set automatically by `update_image_calculated_size_system`
 #[derive(Component, Debug, Copy, Clone, Default, Reflect, FromReflect)]
-#[reflect(Component, Default)]
+#[reflect(Component, Default, FromReflect)]
 pub struct UiImageSize {
     size: Vec2,
 }

From 84323569178a9bd78e1d865b7a6ea24ca44dab71 Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Thu, 20 Apr 2023 18:10:30 +0100
Subject: [PATCH 4/4] cargo fmt

---
 crates/bevy_ui/src/widget/image.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/crates/bevy_ui/src/widget/image.rs b/crates/bevy_ui/src/widget/image.rs
index b7b2d351533bb..ca0a8d1b0c733 100644
--- a/crates/bevy_ui/src/widget/image.rs
+++ b/crates/bevy_ui/src/widget/image.rs
@@ -5,10 +5,11 @@ use bevy_ecs::query::Without;
 use bevy_ecs::{
     prelude::Component,
     query::With,
-    system::{Query, Res}, reflect::ReflectComponent,
+    reflect::ReflectComponent,
+    system::{Query, Res},
 };
 use bevy_math::Vec2;
-use bevy_reflect::{Reflect, std_traits::ReflectDefault, FromReflect, ReflectFromReflect};
+use bevy_reflect::{std_traits::ReflectDefault, FromReflect, Reflect, ReflectFromReflect};
 use bevy_render::texture::Image;
 #[cfg(feature = "bevy_text")]
 use bevy_text::Text;