ui scale fix (#279)

* ui scale fix * Update changelog * Fix debug ui not being scale aware and add test to example --------- Co-authored-by: Aevyrie <[email protected]>
aevyrie · Feb 23, 2024 · e26601c · e26601c
1 parent a318858
commit e26601c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# UNRELEASED
+
+- Added: support for `bevy_ui` `UiScale`.
+
 # 0.17.0
 
 - Update for bevy 0.12

diff --git a/backends/bevy_picking_ui/src/lib.rs b/backends/bevy_picking_ui/src/lib.rs
@@ -31,6 +31,7 @@ use bevy_ui::{prelude::*, RelativeCursorPosition, UiStack};
 use bevy_window::PrimaryWindow;
 
 use bevy_picking_core::backend::prelude::*;
+use bevy_picking_core::pointer::Location;
 
 /// Commonly used imports for the [`bevy_picking_ui`](crate) crate.
 pub mod prelude {
@@ -68,9 +69,11 @@ pub fn ui_picking(
     cameras: Query<(Entity, &Camera, Option<&UiCameraConfig>)>,
     primary_window: Query<Entity, With<PrimaryWindow>>,
     ui_stack: Res<UiStack>,
+    ui_scale: Option<Res<UiScale>>,
     mut node_query: Query<NodeQuery>,
     mut output: EventWriter<PointerHits>,
 ) {
+    let ui_scale = ui_scale.map(|f| f.0).unwrap_or(1.0) as f32;
     for (pointer, location) in pointers.iter().filter_map(|(pointer, pointer_location)| {
         pointer_location
             .location()
@@ -83,7 +86,16 @@ pub fn ui_picking(
                 }
                 false
             })
-            .map(|loc| (pointer, loc))
+            .cloned()
+            .map(|loc| {
+                (
+                    pointer,
+                    Location {
+                        position: loc.position / ui_scale,
+                        ..loc
+                    },
+                )
+            })
     }) {
         let window_entity = primary_window.single();
 

diff --git a/examples/bevy_ui.rs b/examples/bevy_ui.rs
@@ -9,6 +9,7 @@ fn main() {
         .add_plugins(DefaultPickingPlugins)
         .add_systems(Startup, (setup, setup_3d))
         .add_systems(Update, update_button_colors)
+        .insert_resource(UiScale(1.5))
         .run();
 }
 

diff --git a/src/debug/mod.rs b/src/debug/mod.rs
@@ -355,6 +355,7 @@ impl Debug for DebugName {
 pub fn debug_draw(
     mut commands: Commands,
     pointers: Query<(Entity, &pointer::PointerId, &PointerDebug)>,
+    scale: Res<bevy_ui::UiScale>,
 ) {
     use bevy_text::prelude::*;
     use bevy_ui::prelude::*;
@@ -377,8 +378,8 @@ pub fn debug_draw(
                 ),
                 style: Style {
                     position_type: PositionType::Absolute,
-                    left: Val::Px(location.position.x + 5.0),
-                    top: Val::Px(location.position.y + 5.0),
+                    left: Val::Px(location.position.x + 5.0) / scale.0 as f32,
+                    top: Val::Px(location.position.y + 5.0) / scale.0 as f32,
                     ..Default::default()
                 },
                 ..Default::default()