target() -> event().event_target()

Sieluna · Sieluna · commit 2c1d68067c35 · 2026-01-14T01:10:14.000+02:00
diff --git a/bevy_editor_panes/bevy_2d_viewport/src/lib.rs b/bevy_editor_panes/bevy_2d_viewport/src/lib.rs
@@ -47,7 +47,7 @@ impl Plugin for Viewport2dPanePlugin {
                  query: Query<&Bevy2dViewport>| {
                     // Despawn the viewport camera
                     commands
-                        .entity(query.get(trigger.target()).unwrap().camera_id)
+                        .entity(query.get(trigger.event().event_target()).unwrap().camera_id)
                         .despawn();
                 },
             );
diff --git a/bevy_editor_panes/bevy_3d_viewport/src/lib.rs b/bevy_editor_panes/bevy_3d_viewport/src/lib.rs
@@ -71,7 +71,7 @@ impl Plugin for Viewport3dPanePlugin {
                  query: Query<&Bevy3dViewport>| {
                     // Despawn the viewport camera
                     commands
-                        .entity(query.get(trigger.target()).unwrap().camera_id)
+                        .entity(query.get(trigger.event().event_target()).unwrap().camera_id)
                         .despawn();
                 },
             );
@@ -193,10 +193,10 @@ fn on_pane_creation(
                     ImageNode::new(image.clone())
                     :fit_to_parent
                     on(|trigger: On<Pointer<Over>>, mut commands: Commands| {
-                        commands.entity(trigger.target()).insert(Active);
+                        commands.entity(trigger.event().event_target()).insert(Active);
                     })
                     on(|trigger: On<Pointer<Out>>, mut commands: Commands| {
-                        commands.entity(trigger.target()).remove::<Active>();
+                        commands.entity(trigger.event().event_target()).remove::<Active>();
                     })
                     [ :view_gizmo_node ]
                 ],
diff --git a/bevy_editor_panes/bevy_asset_browser/src/ui/nodes.rs b/bevy_editor_panes/bevy_asset_browser/src/ui/nodes.rs
@@ -34,7 +34,7 @@ pub(crate) fn spawn_source_node<'a>(
                 if trigger.event().button != PointerButton::Primary {
                     return;
                 }
-                let button = trigger.target();
+                let button = trigger.event().event_target();
                 let button_children = query_children.get(button).unwrap();
                 let source_name = &query_text
                     .get(button_children[1])
@@ -99,7 +99,7 @@ pub(crate) fn spawn_folder_node<'a>(
                 if trigger.event().button != PointerButton::Primary {
                     return;
                 }
-                let button = trigger.target();
+                let button = trigger.event().event_target();
                 let button_children = query_children.get(button).unwrap();
                 let folder_name = &query_text
                     .get(button_children[1])
diff --git a/bevy_editor_panes/bevy_asset_browser/src/ui/top_bar.rs b/bevy_editor_panes/bevy_asset_browser/src/ui/top_bar.rs
@@ -150,7 +150,7 @@ fn spawn_path_segment_ui<'a>(
                   mut location: ResMut<AssetBrowserLocation>,
                   query_children: Query<&Children>,
                   query_segment_info: Query<(&ChildOf, &LocationSegmentType)>| {
-                let segment = trigger.target();
+                let segment = trigger.event().event_target();
                 let (parent, segment_type) = query_segment_info.get(segment).unwrap();
                 match segment_type {
                     LocationSegmentType::Root => {
diff --git a/bevy_widgets/bevy_context_menu/src/lib.rs b/bevy_widgets/bevy_context_menu/src/lib.rs
@@ -26,7 +26,7 @@ fn on_secondary_button_down_entity_with_context_menu(
         return;
     }
 
-    let target = trigger.target();
+    let target = trigger.event().event_target();
     let Ok(menu) = query.get(target) else {
         return;
     };
@@ -46,7 +46,7 @@ fn on_secondary_button_down_entity_with_context_menu(
             ZIndex(10),
         ))
         .observe(|trigger: On<Pointer<Press>>, mut commands: Commands| {
-            commands.entity(trigger.target()).despawn();
+            commands.entity(trigger.event().event_target()).despawn();
         })
         .id();
 
diff --git a/bevy_widgets/bevy_context_menu/src/ui.rs b/bevy_widgets/bevy_context_menu/src/ui.rs
@@ -61,12 +61,13 @@ pub(crate) fn spawn_option<'a>(
             |trigger: On<Pointer<Over>>,
              theme: Res<Theme>,
              mut query: Query<&mut BackgroundColor>| {
-                *query.get_mut(trigger.target()).unwrap() = theme.context_menu.hover_color;
+                *query.get_mut(trigger.event().event_target()).unwrap() =
+                    theme.context_menu.hover_color;
             },
         )
         .observe(
             |trigger: On<Pointer<Out>>, mut query: Query<&mut BackgroundColor>| {
-                query.get_mut(trigger.target()).unwrap().0 = Color::NONE;
+                query.get_mut(trigger.event().event_target()).unwrap().0 = Color::NONE;
             },
         )
         .observe(
@@ -79,7 +80,7 @@ pub(crate) fn spawn_option<'a>(
                 }
                 // Despawn the context menu when an option is selected
                 let root = child_of_query
-                    .iter_ancestors(trigger.target())
+                    .iter_ancestors(trigger.event().event_target())
                     .last()
                     .unwrap();
                 commands.entity(root).despawn();
diff --git a/bevy_widgets/bevy_menu_bar/src/lib.rs b/bevy_widgets/bevy_menu_bar/src/lib.rs
@@ -71,19 +71,19 @@ fn menu_setup(
 
     let mut hover_over_observer = Observer::new(
         |trigger: On<Pointer<Over>>, theme: Res<Theme>, mut query: Query<&mut BackgroundColor>| {
-            query.get_mut(trigger.target()).unwrap().0 = theme.button.hover_color;
+            query.get_mut(trigger.event().event_target()).unwrap().0 = theme.button.hover_color;
         },
     );
     let mut hover_out_observer = Observer::new(
         |trigger: On<Pointer<Out>>, theme: Res<Theme>, mut query: Query<&mut BackgroundColor>| {
-            query.get_mut(trigger.target()).unwrap().0 = theme.menu.background_color;
+            query.get_mut(trigger.event().event_target()).unwrap().0 = theme.menu.background_color;
         },
     );
 
     let mut click_observer = Observer::new(
         |trigger: On<Pointer<Press>>, mut query: Query<&TopBarItem>| {
             #[allow(clippy::match_same_arms)]
-            match query.get_mut(trigger.target()).unwrap() {
+            match query.get_mut(trigger.event().event_target()).unwrap() {
                 TopBarItem::Logo => {
                     // TODO: Implement logo click action
                 }
diff --git a/bevy_widgets/bevy_scroll_box/src/lib.rs b/bevy_widgets/bevy_scroll_box/src/lib.rs
@@ -177,7 +177,7 @@ fn spawn_scroll_bar<'a>(
              mut query_scrollbox: Query<(&mut ScrollBox, &RelativeCursorPosition, &Children)>,
              query_computed_node: Query<&ComputedNode>,
              mut query_node: Query<&mut Node>| {
-                let handle_entity = trigger.target();
+                let handle_entity = trigger.event().event_target();
                 let handle = query_handle.get(handle_entity).unwrap();
                 let scrollbox_entity = {
                     let scrollbar_parent = query_parent.get(handle_entity).unwrap();
diff --git a/bevy_widgets/bevy_toolbar/src/lib.rs b/bevy_widgets/bevy_toolbar/src/lib.rs
@@ -42,9 +42,10 @@ pub struct ToolbarButton {
 }
 
 /// Available editor tools.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
 pub enum EditorTool {
     /// Selection tool for picking entities.
+    #[default]
     Select,
     /// Move tool for translating entities.
     Move,
@@ -74,12 +75,6 @@ pub enum EditorTool {
 #[derive(Resource, Default)]
 pub struct ActiveTool(pub EditorTool);
 
-impl Default for EditorTool {
-    fn default() -> Self {
-        Self::Select
-    }
-}
-
 /// Marker component for the gizmo mode status text.
 #[derive(Component)]
 pub struct GizmoModeStatus;
diff --git a/crates/bevy_editor_cam/src/extensions/anchor_indicator.rs b/crates/bevy_editor_cam/src/extensions/anchor_indicator.rs
@@ -36,19 +36,21 @@ impl Plugin for AnchorIndicatorPlugin {
                             margin: UiRect::all(Val::Px(-12.)),
                             ..default()
                         },
-                        UiTargetCamera(trigger.target()),
+                        UiTargetCamera(trigger.event().event_target()),
                         Pickable::IGNORE,
                     ))
                     .id();
 
-                commands.entity(trigger.target()).insert(AnchorRoot(id));
+                commands
+                    .entity(trigger.event().event_target())
+                    .insert(AnchorRoot(id));
             },
         )
         .add_observer(
             |trigger: On<Remove, AnchorRoot>,
              mut commands: Commands,
              anchor_root_query: Query<&AnchorRoot>| {
-                if let Ok(anchor_root) = anchor_root_query.get(trigger.target()) {
+                if let Ok(anchor_root) = anchor_root_query.get(trigger.event().event_target()) {
                     commands.entity(anchor_root.0).despawn();
                 }
             },
diff --git a/crates/bevy_editor_core/src/selection.rs b/crates/bevy_editor_core/src/selection.rs
@@ -29,7 +29,7 @@ fn selection_handler(
         return;
     }
 
-    let target = trigger.target();
+    let target = trigger.event().event_target();
     if selectable_query.contains(target) {
         trigger.propagate(false);
         let shift = keyboard_input.any_pressed([KeyCode::ShiftLeft, KeyCode::ShiftRight]);
diff --git a/crates/bevy_editor_core/src/utils.rs b/crates/bevy_editor_core/src/utils.rs
@@ -25,11 +25,13 @@ impl Plugin for CoreUtilsPlugin {
 }
 
 fn on_press(trigger: On<Pointer<Press>>, mut state: ResMut<DragCancelClickState>) {
-    state.0.insert(trigger.target(), Instant::now());
+    state
+        .0
+        .insert(trigger.event().event_target(), Instant::now());
 }
 
 fn on_drag_start(trigger: On<Pointer<DragStart>>, mut state: ResMut<DragCancelClickState>) {
-    state.0.remove(&trigger.target());
+    state.0.remove(&trigger.event().event_target());
 }
 
 fn on_release(
@@ -82,7 +84,7 @@ impl BoxedScene {
 
 impl Scene for BoxedScene {
     fn patch(&self, context: &mut PatchContext, scene: &mut ResolvedScene) {
-        self.0.patch(context, scene)
+        self.0.patch(context, scene);
     }
 }
 
diff --git a/crates/bevy_editor_launcher/src/ui.rs b/crates/bevy_editor_launcher/src/ui.rs
@@ -198,7 +198,7 @@ pub(crate) fn spawn_project_node<'a>(
          theme: Res<Theme>| {
             let project = {
                 let text = {
-                    let project_entity = trigger.target();
+                    let project_entity = trigger.event().event_target();
                     let project_children = query_children.get(project_entity).unwrap();
                     let text_container = project_children.get(1).expect(
                         "Expected project node to have 2 children, (the second being a container for the name)"
@@ -233,7 +233,7 @@ pub(crate) fn spawn_project_node<'a>(
                 project_list.0.retain(|p| p.path != project.path);
                 set_project_list(project_list.0.clone());
                 // Remove project node from UI
-                let project_entity = trigger.target();
+                let project_entity = trigger.event().event_target();
                 commands.entity(project_entity).despawn();
                 return;
             }
@@ -258,7 +258,7 @@ pub(crate) fn spawn_project_node<'a>(
                             project_list.0.retain(|p| p.path != project.path);
                             set_project_list(project_list.0.clone());
                             // Remove project node from UI
-                            let project_entity = trigger.target();
+                            let project_entity = trigger.event().event_target();
                             commands.entity(project_entity).despawn();
                         }
                         _ => {
diff --git a/crates/bevy_pane_layout/src/ui.rs b/crates/bevy_pane_layout/src/ui.rs
@@ -214,7 +214,7 @@ pub(crate) fn spawn_resize_handle<'a>(
 
             drag_state.is_dragging = true;
 
-            let target = trigger.target();
+            let target = trigger.event().event_target();
             let parent = parent_query.get(target).unwrap().parent();
 
             let parent_node_size = computed_node_query.get(parent).unwrap().size();
@@ -247,7 +247,7 @@ pub(crate) fn spawn_resize_handle<'a>(
                 return;
             }
 
-            let target = trigger.target();
+            let target = trigger.event().event_target();
             let parent = parent_query.get(target).unwrap().parent();
             let siblings = children_query.get(parent).unwrap();
             // Find the index of this handle among its siblings
diff --git a/crates/bevy_transform_gizmos/src/lib.rs b/crates/bevy_transform_gizmos/src/lib.rs
@@ -72,22 +72,17 @@ pub struct ScaleGizmo;
 pub struct InternalGizmoCamera;
 
 /// Available gizmo modes.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
 pub enum GizmoMode {
     /// Translation mode (W key).
+    #[default]
     Translate,
     /// Rotation mode (E key).
     Rotate,
     /// Scale mode (R key).
     Scale,
 }
 
-impl Default for GizmoMode {
-    fn default() -> Self {
-        Self::Translate
-    }
-}
-
 /// Settings for the [`TransformGizmoPlugin`].
 #[derive(Resource, Clone, Debug)]
 pub struct TransformGizmoSettings {
@@ -270,7 +265,7 @@ fn on_transform_gizmo_pointer_press(
     if trigger.button != PointerButton::Primary {
         return;
     }
-    let Ok((interaction, child_of)) = target_query.get(trigger.target()) else {
+    let Ok((interaction, child_of)) = target_query.get(trigger.event().event_target()) else {
         return;
     };
     let Ok((mut gizmo, transform)) = query.get_mut(child_of.parent()) else {
