diff --git a/Cargo.toml b/Cargo.toml index 4cb4f6a1..057eca04 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,8 @@ ndk-glue = "0.6.2" [patch.crates-io] ron = { git = "https://github.com/enfipy/ron", rev = "3b1f28075071d743469347575b34caf2043beeb9" } winit = { git = "https://github.com/rust-windowing/winit", rev = "f93f2c158bf527ed56ab2b6f5272214f0c1d9f7d" } -bevy = { git = "https://github.com/dodorare/bevy", branch = "ndk-glue-bump" } +bevy = { git = "https://github.com/dodorare/bevy", rev = "d51104020004d34db1aa3a9a5795834d7814ae55" } +miniquad = { git = "https://github.com/not-fl3/miniquad", rev = "d67ffe6950cf73df307e2d23aaa4726f14399985" } [features] default = [] diff --git a/examples/bevy-explorer/src/explorer.rs b/examples/bevy-explorer/src/explorer.rs index 6634b47a..1c26dd64 100644 --- a/examples/bevy-explorer/src/explorer.rs +++ b/examples/bevy-explorer/src/explorer.rs @@ -164,14 +164,14 @@ pub fn explorer_ui(mut commands: Commands, asset_server: Res) { style: Style { size: Size::new(Val::Percent(100.0), Val::Percent(100.0)), #[cfg(not(target_os = "ios"))] - padding: Rect { + padding: UiRect { left: Val::Percent(6.0), right: Val::Percent(6.0), top: Val::Percent(6.0), bottom: Val::Percent(18.0), }, #[cfg(target_os = "ios")] - padding: Rect { + padding: UiRect { top: Val::Percent(6.0), ..Default::default() }, @@ -200,7 +200,7 @@ pub fn explorer_ui(mut commands: Commands, asset_server: Res) { .spawn_bundle(NodeBundle { style: Style { size: Size::new(Val::Percent(100.0), Val::Auto), - padding: Rect::all(Val::Percent(3.0)), + padding: UiRect::all(Val::Percent(3.0)), flex_direction: FlexDirection::ColumnReverse, align_items: AlignItems::FlexStart, ..Default::default() @@ -270,11 +270,11 @@ pub fn explorer_ui(mut commands: Commands, asset_server: Res) { .spawn_bundle(NodeBundle { style: Style { size: Size::new(Val::Percent(100.0), Val::Auto), - margin: Rect { + margin: UiRect { top: Val::Percent(4.0), ..Default::default() }, - padding: Rect::all(Val::Percent(3.0)), + padding: UiRect::all(Val::Percent(3.0)), flex_direction: FlexDirection::ColumnReverse, align_items: AlignItems::FlexStart, ..Default::default()