Skip to content

Register UiImageSize #8441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 30, 2023
Merged

Register UiImageSize #8441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
21cade9
Added `register_type` for `UiImageSize` to the `UiPlugin`
ickshonpe Apr 19, 2023
eba95a3
Added `FromReflect` derive and `reflect` attribute
ickshonpe Apr 19, 2023
32457c9
reflect `FromReflect`
ickshonpe Apr 20, 2023
8432356
cargo fmt
ickshonpe Apr 20, 2023
00ae1c3
Merge branch 'main' into imagesize-reflect
ickshonpe Apr 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions crates/bevy_ui/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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>()
Expand Down
9 changes: 6 additions & 3 deletions crates/bevy_ui/src/widget/image.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,20 @@ use bevy_ecs::query::Without;
use bevy_ecs::{
prelude::Component,
query::With,
reflect::ReflectComponent,
system::{Query, Res},
};
use bevy_math::Vec2;
use bevy_reflect::{std_traits::ReflectDefault, FromReflect, Reflect, ReflectFromReflect};
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)]
/// This field is set automatically by `update_image_calculated_size_system`
#[derive(Component, Debug, Copy, Clone, Default, Reflect, FromReflect)]
#[reflect(Component, Default, FromReflect)]
pub struct UiImageSize {
size: Vec2,
}
Expand Down