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

Remove the With<Parent> query filter from bevy_ui::render::extract_uinode_borders #9285

Merged
merged 3 commits into from
Jul 31, 2023
Merged

Remove the With<Parent> query filter from bevy_ui::render::extract_uinode_borders #9285

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4658841
`bevy_ui::render::extract_uinode_borders`
ickshonpe Jul 26, 2023
e779a4d
Update crates/bevy_ui/src/render/mod.rs
ickshonpe Jul 31, 2023
b387529
Completed the renaming.
ickshonpe Jul 31, 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
4 changes: 2 additions & 2 deletions crates/bevy_ui/src/render/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ pub fn extract_uinode_borders(
Without<ContentSize>,
>,
>,
parent_node_query: Extract<Query<&Node, With<Parent>>>,
node_query: Extract<Query<&Node>>,
) {
let image = bevy_render::texture::DEFAULT_IMAGE_HANDLE.typed();

Expand Down Expand Up @@ -305,7 +305,7 @@ pub fn extract_uinode_borders(
// Both vertical and horizontal percentage border values are calculated based on the width of the parent node
// <https://developer.mozilla.org/en-US/docs/Web/CSS/border-width>
let parent_width = parent
.and_then(|parent| parent_node_query.get(parent.get()).ok())
.and_then(|parent| node_query.get(parent.get()).ok())
.map(|parent_node| parent_node.size().x)
.unwrap_or(ui_logical_viewport_size.x);
let left =
Expand Down