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

[Merged by Bors] - Overflow::Hidden doesn't work correctly with scale_factor_override #3854

Closed
wants to merge 7 commits into from
Closed

[Merged by Bors] - Overflow::Hidden doesn't work correctly with scale_factor_override #3854

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
471d9fd
# Objective
ickshonpe Feb 3, 2022
f505161
Removed the extend on transformed_rect_size that added an unnecessary…
ickshonpe Feb 3, 2022
47b5969
Replaced the extend and swizzle xy() mess with a single line that uses
ickshonpe Feb 3, 2022
f024096
Previous change was incorrect. Should have been transform_vector3, no…
ickshonpe Feb 3, 2022
fa15a91
Merge branch 'bevyengine:main' into main
ickshonpe Feb 6, 2022
d87f997
Implements std::ops operator traits for Mut.
ickshonpe Feb 6, 2022
c8ee99b
Revert " Implements std::ops operator traits for Mut."
ickshonpe Feb 6, 2022
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
8 changes: 6 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 @@ -344,9 +344,13 @@ pub fn prepare_uinodes(
positions[3] + positions_diff[3].extend(0.),
];


let transformed_rect_size =
(extracted_uinode.transform * uinode_rect.size().extend(0.).extend(0.)).xy();
ickshonpe marked this conversation as resolved.
Show resolved Hide resolved

// Cull nodes that are completely clipped
if positions_diff[0].x - positions_diff[1].x >= rect_size.x
|| positions_diff[1].y - positions_diff[2].y >= rect_size.y
if positions_diff[0].x - positions_diff[1].x >= transformed_rect_size.x
|| positions_diff[1].y - positions_diff[2].y >= transformed_rect_size.y
{
continue;
}
Expand Down