Skip to content
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

Jump to bottom

Implement serialize and deserialize for some UI types #10044

Merged
merged 5 commits into from
Oct 10, 2023
Merged

Implement serialize and deserialize for some UI types #10044

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a31fc62
Added Deserialize and Serialize traits for struct Style
pablo-lua Oct 8, 2023
6c9c864
Added Deserialize and Serialize traits for struct BackgroundColor
pablo-lua Oct 8, 2023
3cfeb37
Added Deserialize and Serialize traits for struct BorderColor
pablo-lua Oct 8, 2023
b0433fe
Added Deserialize and Serialize traits for struct Outline
pablo-lua Oct 8, 2023
6167f90
Code style (CI) correction
pablo-lua Oct 8, 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
16 changes: 8 additions & 8 deletions crates/bevy_ui/src/ui_node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ impl Default for Node {
/// - [A Complete Guide To CSS Grid](https://css-tricks.com/snippets/css/complete-guide-grid/) by CSS Tricks. This is detailed guide with illustrations and comprehensive written explanation of the different CSS Grid properties and how they work.
/// - [CSS Grid Garden](https://cssgridgarden.com/). An interactive tutorial/game that teaches the essential parts of CSS Grid in a fun engaging way.

#[derive(Component, Clone, PartialEq, Debug, Reflect)]
#[reflect(Component, Default, PartialEq)]
#[derive(Component, Clone, PartialEq, Debug, Deserialize, Serialize, Reflect)]
#[reflect(Component, Default, PartialEq, Deserialize, Serialize)]
pub struct Style {
/// Which layout algorithm to use when laying out this node's contents:
/// - [`Display::Flex`]: Use the Flexbox layout algorithm
Expand Down Expand Up @@ -1420,8 +1420,8 @@ pub enum GridPlacementError {
///
/// This serves as the "fill" color.
/// When combined with [`UiImage`], tints the provided texture.
#[derive(Component, Copy, Clone, Debug, Reflect)]
#[reflect(Component, Default)]
#[derive(Component, Copy, Clone, Debug, Deserialize, Serialize, Reflect)]
#[reflect(Component, Default, Deserialize, Serialize)]
pub struct BackgroundColor(pub Color);

impl BackgroundColor {
Expand Down Expand Up @@ -1453,8 +1453,8 @@ pub struct UiTextureAtlasImage {
}

/// The border color of the UI node.
#[derive(Component, Copy, Clone, Debug, Reflect)]
#[reflect(Component, Default)]
#[derive(Component, Copy, Clone, Debug, Deserialize, Serialize, Reflect)]
#[reflect(Component, Default, Deserialize, Serialize)]
pub struct BorderColor(pub Color);

impl From<Color> for BorderColor {
Expand All @@ -1473,8 +1473,8 @@ impl Default for BorderColor {
}
}

#[derive(Component, Copy, Clone, Default, Debug, Reflect)]
#[reflect(Component, Default)]
#[derive(Component, Copy, Clone, Default, Debug, Deserialize, Serialize, Reflect)]
#[reflect(Component, Default, Deserialize, Serialize)]
/// The [`Outline`] component adds an outline outside the edge of a UI node.
/// Outlines do not take up space in the layout
///
Expand Down