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

UI: allow border radius to be optional for images and background #12592

Merged
merged 1 commit into from Mar 20, 2024
Merged

UI: allow border radius to be optional for images and background #12592

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 12 additions & 6 deletions crates/bevy_ui/src/render/mod.rs
View file
Open in desktop
Expand Up @@ -193,7 +193,7 @@ pub fn extract_uinode_background_colors(
Option<&CalculatedClip>,
Option<&TargetCamera>,
&BackgroundColor,
&BorderRadius,
Option<&BorderRadius>,
)>,
>,
) {
Expand Down Expand Up @@ -224,8 +224,11 @@ pub fn extract_uinode_background_colors(
continue;
}

let border_radius =
resolve_border_radius(border_radius, uinode.size(), viewport_size, ui_scale.0);
let border_radius = if let Some(border_radius) = border_radius {
resolve_border_radius(border_radius, uinode.size(), viewport_size, ui_scale.0)
} else {
[0.; 4]
};

extracted_uinodes.uinodes.insert(
entity,
Expand Down Expand Up @@ -268,7 +271,7 @@ pub fn extract_uinode_images(
&UiImage,
Option<&TextureAtlas>,
Option<&ComputedTextureSlices>,
&BorderRadius,
Option<&BorderRadius>,
)>,
>,
) {
Expand Down Expand Up @@ -323,8 +326,11 @@ pub fn extract_uinode_images(
),
};

let border_radius =
resolve_border_radius(border_radius, uinode.size(), viewport_size, ui_scale.0);
let border_radius = if let Some(border_radius) = border_radius {
resolve_border_radius(border_radius, uinode.size(), viewport_size, ui_scale.0)
} else {
[0.; 4]
};

extracted_uinodes.uinodes.insert(
commands.spawn_empty().id(),
Expand Down