forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix conflicts

Browse Source
This commit is contained in:
Tim Blackbird 2025-07-15 13:00:34 +02:00
parent 04f605538a
commit 7582b228e9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/bevy_ecs/src/lifecycle.rs
View File

@ -54,8 +54,8 @@ use crate::{
component::{Component, ComponentId, ComponentIdFor, Tick}, component::{Component, ComponentId, ComponentIdFor, Tick},
entity::Entity, entity::Entity,
event::{ event::{
BufferedEvent, EntityEvent, Event, EventCursor, EventId, EventIterator, BufferedEvent, EntityEvent, EventCursor, EventId, EventIterator, EventIteratorWithId,
EventIteratorWithId, EventKey, Events, EventKey, Events,
}, },
query::FilteredAccessSet, query::FilteredAccessSet,
relationship::RelationshipHookMode, relationship::RelationshipHookMode,

2
examples/ui/scroll.rs
View File

@ -50,7 +50,7 @@ fn send_scroll_events(
} }
/// UI scrolling event. /// UI scrolling event.
#[derive(Event, EntityEvent, Debug)] #[derive(EntityEvent, Debug)]
#[entity_event(auto_propagate, traversal = &'static ChildOf)] #[entity_event(auto_propagate, traversal = &'static ChildOf)]
struct Scroll { struct Scroll {
/// Scroll delta in logical coordinates. /// Scroll delta in logical coordinates.