Skip to content

Commit 61d801b

Browse files
committed
Move react_to_resize
1 parent 4e6d8f7 commit 61d801b

File tree

1 file changed

+24
-26
lines changed

1 file changed

+24
-26
lines changed

crates/bevy_winit/src/lib.rs

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ pub fn winit_runner(mut app: App) {
657657
});
658658
}
659659
WindowEvent::RedrawRequested => {
660-
redraw_requested(
660+
run_app_update_if_should(
661661
&mut runner_state,
662662
&mut app,
663663
&mut focused_windows_state,
@@ -762,24 +762,7 @@ pub fn winit_runner(mut app: App) {
762762
}
763763
}
764764

765-
fn react_to_resize(
766-
window: &mut Mut<'_, Window>,
767-
size: winit::dpi::PhysicalSize<u32>,
768-
event_writers: &mut WindowAndInputEventWriters<'_>,
769-
window_entity: Entity,
770-
) {
771-
window
772-
.resolution
773-
.set_physical_resolution(size.width, size.height);
774-
775-
event_writers.window_resized.send(WindowResized {
776-
window: window_entity,
777-
width: window.width(),
778-
height: window.height(),
779-
});
780-
}
781-
782-
fn redraw_requested(
765+
fn run_app_update_if_should(
783766
runner_state: &mut WinitAppRunnerState,
784767
app: &mut App,
785768
focused_windows_state: &mut SystemState<(Res<WinitSettings>, Query<&Window>)>,
@@ -814,13 +797,11 @@ fn redraw_requested(
814797
let (config, windows) = focused_windows_state.get(&app.world);
815798
let focused = windows.iter().any(|window| window.focused);
816799
let should_update = match config.update_mode(focused) {
817-
UpdateMode::Continuous | UpdateMode::Reactive { .. } => {
818-
// `Reactive`: In order for `event_handler` to have been called, either
819-
// we received a window or raw input event, the `wait` elapsed, or a
820-
// redraw was requested (by the app or the OS). There are no other
821-
// conditions, so we can just return `true` here.
822-
true
823-
}
800+
// `Reactive`: In order for `event_handler` to have been called, either
801+
// we received a window or raw input event, the `wait` elapsed, or a
802+
// redraw was requested (by the app or the OS). There are no other
803+
// conditions, so we can just return `true` here.
804+
UpdateMode::Continuous | UpdateMode::Reactive { .. } => true,
824805
UpdateMode::ReactiveLowPower { .. } => {
825806
runner_state.wait_elapsed
826807
|| runner_state.redraw_requested
@@ -898,3 +879,20 @@ fn redraw_requested(
898879

899880
create_window_system_state.apply(&mut app.world);
900881
}
882+
883+
fn react_to_resize(
884+
window: &mut Mut<'_, Window>,
885+
size: winit::dpi::PhysicalSize<u32>,
886+
event_writers: &mut WindowAndInputEventWriters<'_>,
887+
window_entity: Entity,
888+
) {
889+
window
890+
.resolution
891+
.set_physical_resolution(size.width, size.height);
892+
893+
event_writers.window_resized.send(WindowResized {
894+
window: window_entity,
895+
width: window.width(),
896+
height: window.height(),
897+
});
898+
}

0 commit comments

Comments
 (0)