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

Fix the Bevy UI backend so it ignores clipped areas of UI nodes #285

Merged
merged 6 commits into from
Feb 23, 2024
Merged

Fix the Bevy UI backend so it ignores clipped areas of UI nodes #285

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4df4b1c
The Bevy UI backend doesn't check for clipping, and allows interactio…
ickshonpe Nov 27, 2023
aa3f4c4
Removed unused import from `bevy_picking_ui`
ickshonpe Dec 11, 2023
53bbef2
Merge remote-tracking branch 'origin/main' into pr/ickshonpe/285
aevyrie Feb 23, 2024
5d919a5
remove unused deps
aevyrie Feb 23, 2024
b2ef52b
Merge remote-tracking branch 'origin/main' into pr/ickshonpe/285
aevyrie Feb 23, 2024
55de570
update changelog
aevyrie Feb 23, 2024
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
26 changes: 8 additions & 18 deletions backends/bevy_picking_ui/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ pub fn ui_picking(
cameras: Query<(Entity, &Camera, Option<&UiCameraConfig>)>,
primary_window: Query<Entity, With<PrimaryWindow>>,
ui_stack: Res<UiStack>,
ui_scale: Res<UiScale>,
mut node_query: Query<NodeQuery>,
mut output: EventWriter<PointerHits>,
) {
Expand Down Expand Up @@ -120,24 +121,13 @@ pub fn ui_picking(
}
}

let position = node.global_transform.translation();
let ui_position = position.truncate();
let extents = node.node.size() / 2.0;
let mut min = ui_position - extents;
if let Some(clip) = node.calculated_clip {
min = Vec2::max(min, clip.clip.min);
}

// The mouse position relative to the node
// (0., 0.) is the top-left corner, (1., 1.) is the bottom-right corner
let relative_cursor_position = Vec2::new(
(location.position.x - min.x) / node.node.size().x,
(location.position.y - min.y) / node.node.size().y,
);

if (0.0..1.).contains(&relative_cursor_position.x)
&& (0.0..1.).contains(&relative_cursor_position.y)
{
let node_rect = node.node.logical_rect(node.global_transform);
let visible_rect = node
.calculated_clip
.map(|clip| node_rect.intersect(clip.clip))
.unwrap_or(node_rect);
let cursor_position = location.position / ui_scale.0 as f32;
if visible_rect.contains(cursor_position) {
Some(*entity)
} else {
None
Expand Down
Loading