leyoda/iced-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

refactor: wrap repeated run_action call in a macro

Browse source
This commit is contained in:
Ilia Malanin 2026-06-09 14:06:09 +02:00 • committed by Ashley Wulber
parent f725961c87
commit c3c8fcf52c
1 changed files with 26 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

94
winit/src/lib.rs
View file

@ -838,6 +838,28 @@ async fn run_instance<P>(
log::info!("System theme: {system_theme:?}"); log::info!("System theme: {system_theme:?}");
macro_rules! run_action {
($action:expr) => {
run_action(
$action,
&program,
&mut runtime,
&mut compositor,
&mut events,
&mut messages,
&mut clipboard,
&mut control_sender,
&mut user_interfaces,
&mut window_manager,
&mut ui_caches,
&mut is_window_opening,
&mut system_theme,
&mut platform_specific_handler,
is_daemon,
)
};
}
'next_event: loop { 'next_event: loop {
// Empty the queue if possible // Empty the queue if possible
let event = if let Ok(event) = event_receiver.try_recv() { let event = if let Ok(event) = event_receiver.try_recv() {
@ -1001,23 +1023,7 @@ async fn run_instance<P>(
} }
} }
Event::UserEvent(action) => { Event::UserEvent(action) => {
let exited = run_action( let exited = run_action!(action);
action,
&program,
&mut runtime,
&mut compositor,
&mut events,
&mut messages,
&mut clipboard,
&mut control_sender,
&mut user_interfaces,
&mut window_manager,
&mut ui_caches,
&mut is_window_opening,
&mut system_theme,
&mut platform_specific_handler,
is_daemon,
);
if exited { if exited {
runtime.track(None.into_iter()); runtime.track(None.into_iter());
} }
@ -1159,23 +1165,7 @@ async fn run_instance<P>(
continue; continue;
} }
_ = run_action( _ = run_action!(action);
action,
&program,
&mut runtime,
&mut compositor,
&mut events,
&mut messages,
&mut clipboard,
&mut control_sender,
&mut user_interfaces,
&mut window_manager,
&mut ui_caches,
&mut is_window_opening,
&mut system_theme,
&mut platform_specific_handler,
is_daemon,
);
} }
for (window_id, window) in window_manager.iter_mut() { for (window_id, window) in window_manager.iter_mut() {
@ -1358,23 +1348,7 @@ async fn run_instance<P>(
if matches!(event, winit::event::WindowEvent::CloseRequested) if matches!(event, winit::event::WindowEvent::CloseRequested)
&& window.exit_on_close_request && window.exit_on_close_request
{ {
_ = run_action( _ = run_action!(Action::Window(runtime::window::Action::Close(id)));
Action::Window(runtime::window::Action::Close(id)),
&program,
&mut runtime,
&mut compositor,
&mut events,
&mut messages,
&mut clipboard,
&mut control_sender,
&mut user_interfaces,
&mut window_manager,
&mut ui_caches,
&mut is_window_opening,
&mut system_theme,
&mut platform_specific_handler,
is_daemon,
);
} else { } else {
window.state.update(&program, window.raw.as_ref(), &event); window.state.update(&program, window.raw.as_ref(), &event);
@ -1552,23 +1526,7 @@ async fn run_instance<P>(
)); ));
for action in actions { for action in actions {
let exited = run_action( let exited = run_action!(action);
action,
&program,
&mut runtime,
&mut compositor,
&mut events,
&mut messages,
&mut clipboard,
&mut control_sender,
&mut user_interfaces,
&mut window_manager,
&mut ui_caches,
&mut is_window_opening,
&mut system_theme,
&mut platform_specific_handler,
is_daemon,
);
if exited { if exited {
runtime.track(None.into_iter()); runtime.track(None.into_iter());
} }