Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup bevy winit #11489

Merged
merged 16 commits into from
Jan 28, 2024
+433 −624
Merged

Cleanup bevy winit #11489

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2ae6ab7
Rename WindowMoved.entity to window
atlv24 Jan 23, 2024
70f33dd
Refactor create_window SystemState
atlv24 Jan 23, 2024
149fe2d
Remove unused imports
atlv24 Jan 23, 2024
351bdfe
Combine nested conditions
atlv24 Jan 23, 2024
5a65d69
Extract message to variable to collapse method chain
atlv24 Jan 23, 2024
468959d
Refactor create_window SystemState android
atlv24 Jan 23, 2024
3031ac8
Fix comments
atlv24 Jan 23, 2024
e58144b
Refactor event loop
atlv24 Jan 23, 2024
5f98852
Fix dead code warning
atlv24 Jan 23, 2024
a891dd3
Use ellipsis to discard
atlv24 Jan 23, 2024
4481188
Collapse match
atlv24 Jan 23, 2024
2a07690
Extract var to collapse
atlv24 Jan 23, 2024
0765bb1
Rename to window_component
atlv24 Jan 23, 2024
3b15c21
Remove unused WindowTitleCache
atlv24 Jan 23, 2024
633ccd0
Merge branch 'main' into cleanup-bevy_winit
atlv24 Jan 23, 2024
9501b46
Merge branch 'main' into cleanup-bevy_winit
mockersf Jan 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Extract message to variable to collapse method chain
  • Loading branch information
@atlv24
atlv24 committed Jan 23, 2024
commit 5a65d696bcb8ea473035c5688c16f9e4db10b60a
8 changes: 2 additions & 6 deletions crates/bevy_winit/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,8 @@ impl Plugin for WinitPlugin {
#[cfg(target_os = "android")]
{
use winit::platform::android::EventLoopBuilderExtAndroid;
event_loop_builder.with_android_app(
ANDROID_APP
.get()
.expect("Bevy must be setup with the #[bevy_main] macro on Android")
.clone(),
);
let msg = "Bevy must be setup with the #[bevy_main] macro on Android";
event_loop_builder.with_android_app(ANDROID_APP.get().expect(msg).clone());
}

app.init_non_send_resource::<WinitWindows>()
Expand Down