Skip to content

Commit 2d99d22

Browse files
df51d0xfff
andauthored
fix: query UiGlobalTransform instead of GlobalTransform (#21382)
# Objective Fixes #21381 ## Solution - Describe the solution used to achieve the objective above. ## Testing - I tested the changes on examples/ui/viewport_node --------- Co-authored-by: 0xfff <[email protected]>
1 parent c33529f commit 2d99d22

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

crates/bevy_ui/src/widget/viewport.rs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ use bevy_picking::{
2828
use bevy_platform::collections::HashMap;
2929
use bevy_reflect::Reflect;
3030
#[cfg(feature = "bevy_ui_picking_backend")]
31-
use bevy_transform::components::GlobalTransform;
32-
#[cfg(feature = "bevy_ui_picking_backend")]
3331
use uuid::Uuid;
3432

33+
#[cfg(feature = "bevy_ui_picking_backend")]
34+
use crate::UiGlobalTransform;
3535
use crate::{ComputedNode, Node};
3636

3737
/// Component used to render a [`Camera::target`] to a node.
@@ -73,7 +73,7 @@ pub fn viewport_picking(
7373
&PointerId,
7474
&mut PointerLocation,
7575
&ComputedNode,
76-
&GlobalTransform,
76+
&UiGlobalTransform,
7777
)>,
7878
camera_query: Query<&Camera>,
7979
hover_map: Res<HoverMap>,
@@ -123,10 +123,8 @@ pub fn viewport_picking(
123123
};
124124

125125
// Create a `Rect` in *physical* coordinates centered at the node's GlobalTransform
126-
let node_rect = Rect::from_center_size(
127-
global_transform.translation().truncate(),
128-
computed_node.size(),
129-
);
126+
let node_rect =
127+
Rect::from_center_size(global_transform.translation.trunc(), computed_node.size());
130128
// Location::position uses *logical* coordinates
131129
let top_left = node_rect.min * computed_node.inverse_scale_factor();
132130
let logical_size = computed_node.size() * computed_node.inverse_scale_factor();

0 commit comments

Comments
 (0)