Skip to content

Commit 8b4d8d3

Browse files
databasedavdatabasedav
committed
upgrade
1 parent 1889b0e commit 8b4d8d3

File tree

13 files changed

+968
-548
lines changed

13 files changed

+968
-548
lines changed

‎Cargo.lock‎

Lines changed: 919 additions & 503 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ repository = "https://github.com/databasedav/jonmo"
1111
documentation = "https://docs.rs/jonmo"
1212

1313
[dependencies]
14-
bevy_app = { version = "0.16", default-features = false }
15-
bevy_derive = { version = "0.16", default-features = false }
16-
bevy_ecs = { version = "0.16", default-features = false }
17-
bevy_platform = { version = "0.16", default-features = false }
18-
bevy_log = { version = "0.16", default-features = false, optional = true }
19-
bevy_time = { version = "0.16", default-features = false, optional = true }
14+
bevy_app = { version = "0.17", default-features = false }
15+
bevy_derive = { version = "0.17", default-features = false }
16+
bevy_ecs = { version = "0.17", default-features = false }
17+
bevy_platform = { version = "0.17", default-features = false }
18+
bevy_log = { version = "0.17", default-features = false, optional = true }
19+
bevy_time = { version = "0.17", default-features = false, optional = true }
2020
enclose = "1.2"
2121
dyn-clone = "1.0"
2222
apply = "0.3"
@@ -63,7 +63,7 @@ web = [
6363
deployed_wasm_example = []
6464

6565
[dev-dependencies]
66-
bevy = { version = "0.16", features = ["track_location"] }
66+
bevy = { version = "0.17", features = ["track_location"] }
6767
rand = "0.9"
6868
test-log = { version = "0.2", default-features = false, features = ["trace"] }
6969

‎examples/basic.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ fn ui(world: &mut World) {
4444
}
4545

4646
fn incr_value(mut ticker: ResMut<ValueTicker>, time: Res<Time>, mut values: Query<&mut Value>) {
47-
if ticker.tick(time.delta()).finished() {
47+
if ticker.tick(time.delta()).is_finished() {
4848
for mut value in values.iter_mut() {
4949
value.0 = value.0.wrapping_add(1);
5050
}

‎examples/basic_builder.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fn ui() -> JonmoBuilder {
5050
}
5151

5252
fn incr_value(mut ticker: ResMut<ValueTicker>, time: Res<Time>, mut values: Query<&mut Value>) {
53-
if ticker.tick(time.delta()).finished() {
53+
if ticker.tick(time.delta()).is_finished() {
5454
for mut value in values.iter_mut() {
5555
value.0 = value.0.wrapping_add(1);
5656
}

‎examples/basic_builder_inject.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fn ui(world: &mut World) {
4545
}
4646

4747
fn incr_value(mut ticker: ResMut<ValueTicker>, time: Res<Time>, mut values: Query<&mut Value>) {
48-
if ticker.tick(time.delta()).finished() {
48+
if ticker.tick(time.delta()).is_finished() {
4949
for mut value in values.iter_mut() {
5050
value.0 = value.0.wrapping_add(1);
5151
}

‎examples/counter.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ fn counter_button(counter_holder: LazyEntity, color: Color, label: &'static str,
118118
// observers
119119
.with_entity(move |mut entity| {
120120
entity.observe(
121-
move |trigger: Trigger<Pointer<Click>>, mut counters: Query<&mut Counter>| {
122-
if matches!(trigger.button, PointerButton::Primary) {
121+
move |on: On<Pointer<Click>>, mut counters: Query<&mut Counter>| {
122+
if matches!(on.button, PointerButton::Primary) {
123123
// Use the fulfilled `LazyEntity` to get mutable access to the `Counter` component on our
124124
// state-holding entity.
125125
if let Ok(mut counter) = counters.get_mut(counter_holder.get()) {

‎examples/filters.rs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@ fn ui(items: MutableVec<Data>, rows: MutableVec<()>) -> JonmoBuilder {
110110
Text::new("source"),
111111
TextColor(Color::WHITE),
112112
TextFont::from_font_size(30.),
113-
TextLayout::new_with_justify(JustifyText::Center),
113+
TextLayout::new_with_justify(Justify::Center),
114114
)))
115115
.child(button("+", -2.).apply(on_click(
116-
|_: Trigger<Pointer<Click>>,
116+
|_: On<Pointer<Click>>,
117117
datas: Res<Datas>,
118118
mut mutable_vec_datas: Query<&mut MutableVecData<_>>| {
119119
datas.0.write(&mut mutable_vec_datas).insert(0, random_data());
@@ -150,7 +150,7 @@ fn ui(items: MutableVec<Data>, rows: MutableVec<()>) -> JonmoBuilder {
150150
// BackgroundColor(Color::WHITE),
151151
))
152152
.child(button("+", -2.).apply(on_click(
153-
|_: Trigger<Pointer<Click>>, rows: Res<Rows>, mut mutable_vec_datas: Query<&mut MutableVecData<_>>| {
153+
|_: On<Pointer<Click>>, rows: Res<Rows>, mut mutable_vec_datas: Query<&mut MutableVecData<_>>| {
154154
rows.0.write(&mut mutable_vec_datas).push(());
155155
},
156156
))),
@@ -205,7 +205,7 @@ fn text_node(text: &'static str) -> JonmoBuilder {
205205
Node::default(),
206206
Text::new(text),
207207
TextColor(Color::WHITE),
208-
TextLayout::new_with_justify(JustifyText::Center),
208+
TextLayout::new_with_justify(Justify::Center),
209209
BorderRadius::all(Val::Px(GAP)),
210210
))
211211
}
@@ -237,7 +237,7 @@ fn number_toggle(row_parent: LazyEntity, parity: Parity) -> impl Fn(JonmoBuilder
237237
move |builder| {
238238
builder
239239
.apply(on_click(
240-
clone!((row_parent) move |_: Trigger<Pointer<Click>>, mut number_filters: Query<&mut NumberFilters>| {
240+
clone!((row_parent) move |_: On<Pointer<Click>>, mut number_filters: Query<&mut NumberFilters>| {
241241
toggle(&mut number_filters.get_mut(row_parent.get()).unwrap().0, parity);
242242
}),
243243
))
@@ -274,7 +274,7 @@ fn number_toggles(row_parent: LazyEntity) -> JonmoBuilder {
274274
.insert(TextFont::from_font_size(13.))
275275
.insert(BackgroundColor(bevy::color::palettes::basic::GRAY.into()))
276276
.apply(on_click(
277-
clone!((row_parent) move |_: Trigger<Pointer<Click>>, world: &mut World| {
277+
clone!((row_parent) move |_: On<Pointer<Click>>, world: &mut World| {
278278
let mut entity = world.entity_mut(row_parent.get());
279279
if entity.take::<Sorted>().is_none() { entity.insert(Sorted); }
280280
}),
@@ -298,7 +298,7 @@ fn shape_toggle(row_parent: LazyEntity, shape: Shape) -> JonmoBuilder {
298298
BackgroundColor(bevy::color::palettes::basic::GRAY.into()),
299299
))
300300
.apply(on_click(
301-
clone!((row_parent) move |_: Trigger<Pointer<Click>>, mut shape_filters: Query<&mut ShapeFilters>| {
301+
clone!((row_parent) move |_: On<Pointer<Click>>, mut shape_filters: Query<&mut ShapeFilters>| {
302302
toggle(&mut shape_filters.get_mut(row_parent.get()).unwrap().0, shape);
303303
}),
304304
))
@@ -342,10 +342,10 @@ fn color_toggles(row_parent: LazyEntity) -> JonmoBuilder {
342342
},
343343
BorderRadius::all(Val::Px(GAP)),
344344
BackgroundColor(color.into()),
345-
BorderColor(Color::BLACK),
345+
BorderColor::all(Color::BLACK),
346346
))
347347
.apply(on_click(
348-
clone!((row_parent) move |_: Trigger<Pointer<Click>>, mut color_filters: Query<&mut ColorFilters>| {
348+
clone!((row_parent) move |_: On<Pointer<Click>>, mut color_filters: Query<&mut ColorFilters>| {
349349
toggle(&mut color_filters.get_mut(row_parent.get()).unwrap().0, color);
350350
}),
351351
))
@@ -370,7 +370,7 @@ fn button(text: &'static str, offset: f32) -> JonmoBuilder {
370370
..default()
371371
},
372372
BackgroundColor(bevy::color::palettes::basic::GRAY.into()),
373-
BorderColor(Color::WHITE),
373+
BorderColor::all(Color::WHITE),
374374
BorderRadius::all(Val::Px(GAP)),
375375
))
376376
.child(
@@ -402,11 +402,11 @@ fn row(index: impl Signal<Item = Option<usize>>, items: MutableVec<Data>) -> Jon
402402
button("-", -3.)
403403
.component_signal(index.map_in(|index| index.map(Index)))
404404
.apply(on_click(
405-
|click: Trigger<Pointer<Click>>,
405+
|click: On<Pointer<Click>>,
406406
rows: Res<Rows>,
407407
indices: Query<&Index>,
408408
mut mutable_vec_datas: Query<&mut MutableVecData<_>>| {
409-
if let Ok(&Index(index)) = indices.get(click.target()) {
409+
if let Ok(&Index(index)) = indices.get(click.event().event_target()) {
410410
rows.0.write(&mut mutable_vec_datas).remove(index);
411411
}
412412
},
@@ -504,11 +504,11 @@ fn item(index: impl Signal<Item = Option<usize>>, Data { number, color, shape }:
504504
))
505505
.component_signal(index.map_in(|index| index.map(Index)))
506506
.apply(on_click(
507-
|click: Trigger<Pointer<Click>>,
507+
|click: On<Pointer<Click>>,
508508
datas: Res<Datas>,
509509
indices: Query<&Index>,
510510
mut mutable_vec_datas: Query<&mut MutableVecData<_>>| {
511-
if let Ok(&Index(index)) = indices.get(click.target()) {
511+
if let Ok(&Index(index)) = indices.get(click.event().event_target()) {
512512
datas.0.write(&mut mutable_vec_datas).remove(index);
513513
}
514514
},
@@ -517,7 +517,7 @@ fn item(index: impl Signal<Item = Option<usize>>, Data { number, color, shape }:
517517
Node::default(),
518518
Text::new(number.to_string()),
519519
TextColor(Color::BLACK),
520-
TextLayout::new_with_justify(JustifyText::Center),
520+
TextLayout::new_with_justify(Justify::Center),
521521
))
522522
}
523523

‎examples/letters.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ fn text_node() -> JonmoBuilder {
130130
JonmoBuilder::from((
131131
Node::default(),
132132
TextColor(Color::WHITE),
133-
TextLayout::new_with_justify(JustifyText::Center),
133+
TextLayout::new_with_justify(Justify::Center),
134134
BorderRadius::all(Val::Px(GAP)),
135135
))
136136
}
@@ -147,8 +147,8 @@ fn letter(letter: char, data: impl Signal<Item = LetterData> + Clone) -> JonmoBu
147147
BorderRadius::all(Val::Px(GAP * 2.)),
148148
))
149149
.with_entity(|mut entity| {
150-
entity.observe(|click: Trigger<Pointer<Click>>, nodes: Query<&ComputedNode>| {
151-
println!("{}", nodes.get(click.target()).unwrap().size());
150+
entity.observe(|click: On<Pointer<Click>>, nodes: Query<&ComputedNode>| {
151+
println!("{}", nodes.get(click.event().event_target()).unwrap().size());
152152
});
153153
})
154154
.component_signal(

‎examples/lifetimes.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ fn ui_root(colors: impl SignalVec<Item = Color>) -> JonmoBuilder {
121121
// button entity to listen for a `Click` event.
122122
world.entity_mut(entity).observe(
123123
// This closure is the event handler that runs when the button is clicked.
124-
move |_: Trigger<Pointer<Click>>,
124+
move |_: On<Pointer<Click>>,
125125
colors: Res<Colors>,
126126
mut mutable_vec_datas: Query<&mut MutableVecData<_>>| {
127127
// Try to get the `Index` component from the clicked entity.
@@ -136,7 +136,7 @@ fn ui_root(colors: impl SignalVec<Item = Color>) -> JonmoBuilder {
136136
Node::default(),
137137
Text::new("+"),
138138
TextColor(Color::WHITE),
139-
TextLayout::new_with_justify(JustifyText::Center),
139+
TextLayout::new_with_justify(Justify::Center),
140140
))),
141141
)
142142
}
@@ -200,7 +200,7 @@ fn item(index: impl Signal<Item = Option<usize>> + Clone, color: Color) -> Jonmo
200200
// Start with a `Text` component with no sections. We'll add them as children.
201201
Text::new(""),
202202
TextColor(Color::BLACK), // Default color, can be overridden by children.
203-
TextLayout::new_with_justify(JustifyText::Center),
203+
TextLayout::new_with_justify(Justify::Center),
204204
))
205205
// Child 1: A static text span.
206206
.child((TextColor(Color::BLACK), TextSpan::new("item ")))
@@ -258,7 +258,7 @@ fn item(index: impl Signal<Item = Option<usize>> + Clone, color: Color) -> Jonmo
258258
// button entity to listen for a `Click` event.
259259
world.entity_mut(entity).observe(
260260
// This closure is the event handler that runs when the button is clicked.
261-
move |_: Trigger<Pointer<Click>>,
261+
move |_: On<Pointer<Click>>,
262262
indices: Query<&Index>,
263263
colors: Res<Colors>,
264264
mut mutable_vec_datas: Query<&mut MutableVecData<_>>| {
@@ -279,7 +279,7 @@ fn item(index: impl Signal<Item = Option<usize>> + Clone, color: Color) -> Jonmo
279279
Node::default(),
280280
Text::new("x"),
281281
TextColor(Color::WHITE),
282-
TextLayout::new_with_justify(JustifyText::Center),
282+
TextLayout::new_with_justify(Justify::Center),
283283
))),
284284
)
285285
}

‎examples/test.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ fn item(number: i32) -> JonmoBuilder {
121121
},
122122
Text(number.to_string()),
123123
TextColor(Color::BLACK),
124-
TextLayout::new_with_justify(JustifyText::Center),
124+
TextLayout::new_with_justify(Justify::Center),
125125
Lifetime::default(),
126126
)))
127127
}

0 commit comments

Comments
 (0)