mirror of
https://github.com/emilk/egui.git
synced 2026-09-01 22:30:03 -04:00
format let-else statements
This commit is contained in:
@@ -1177,8 +1177,12 @@ mod glow_integration {
|
|||||||
let Some(window) = window else { return };
|
let Some(window) = window else { return };
|
||||||
|
|
||||||
let window = &mut *window.borrow_mut();
|
let window = &mut *window.borrow_mut();
|
||||||
let Some(winit_state) = &mut window.egui_winit else { return };
|
let Some(winit_state) = &mut window.egui_winit else {
|
||||||
let Some(win) = window.window.clone() else { return };
|
return;
|
||||||
|
};
|
||||||
|
let Some(win) = window.window.clone() else {
|
||||||
|
return;
|
||||||
|
};
|
||||||
let win = win.borrow();
|
let win = win.borrow();
|
||||||
let mut input = winit_state.take_egui_input(&win);
|
let mut input = winit_state.take_egui_input(&win);
|
||||||
input.time = Some(beginning.elapsed().as_secs_f64());
|
input.time = Some(beginning.elapsed().as_secs_f64());
|
||||||
@@ -1978,7 +1982,9 @@ mod wgpu_integration {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn build_windows(&mut self, event_loop: &EventLoopWindowTarget<UserEvent>) {
|
fn build_windows(&mut self, event_loop: &EventLoopWindowTarget<UserEvent>) {
|
||||||
let Some(running) = &mut self.running else {return};
|
let Some(running) = &mut self.running else {
|
||||||
|
return;
|
||||||
|
};
|
||||||
let viewport_builders = running.builders.borrow();
|
let viewport_builders = running.builders.borrow();
|
||||||
|
|
||||||
for (id, Viewport { window, state, .. }) in running.viewports.borrow_mut().iter_mut() {
|
for (id, Viewport { window, state, .. }) in running.viewports.borrow_mut().iter_mut() {
|
||||||
@@ -2275,8 +2281,12 @@ mod wgpu_integration {
|
|||||||
// Render sync viewport:
|
// Render sync viewport:
|
||||||
let viewport = viewports.borrow().get(&pair).cloned();
|
let viewport = viewports.borrow().get(&pair).cloned();
|
||||||
let Some(viewport) = viewport else { return };
|
let Some(viewport) = viewport else { return };
|
||||||
let Some(winit_state) = &mut *viewport.state.borrow_mut() else { return };
|
let Some(winit_state) = &mut *viewport.state.borrow_mut() else {
|
||||||
let Some(window) = viewport.window else { return };
|
return;
|
||||||
|
};
|
||||||
|
let Some(window) = viewport.window else {
|
||||||
|
return;
|
||||||
|
};
|
||||||
let win = window.borrow();
|
let win = window.borrow();
|
||||||
let mut input = winit_state.take_egui_input(&win);
|
let mut input = winit_state.take_egui_input(&win);
|
||||||
input.time = Some(beginning.elapsed().as_secs_f64());
|
input.time = Some(beginning.elapsed().as_secs_f64());
|
||||||
@@ -2397,10 +2407,21 @@ mod wgpu_integration {
|
|||||||
viewport_commands,
|
viewport_commands,
|
||||||
};
|
};
|
||||||
{
|
{
|
||||||
let Some((viewport_id, Viewport{window: Some(window), state, viewport_ui_cb, parent_id })) = viewport_maps.borrow()
|
let Some((
|
||||||
|
viewport_id,
|
||||||
|
Viewport {
|
||||||
|
window: Some(window),
|
||||||
|
state,
|
||||||
|
viewport_ui_cb,
|
||||||
|
parent_id,
|
||||||
|
},
|
||||||
|
)) = viewport_maps
|
||||||
|
.borrow()
|
||||||
.get(&window_id)
|
.get(&window_id)
|
||||||
.and_then(|id|(viewports.borrow().get(id).map(|w|(*id, w.clone()))))
|
.and_then(|id| (viewports.borrow().get(id).map(|w| (*id, w.clone()))))
|
||||||
else{ return EventResult::Wait };
|
else {
|
||||||
|
return EventResult::Wait;
|
||||||
|
};
|
||||||
// This is used to not render a viewport if is sync
|
// This is used to not render a viewport if is sync
|
||||||
if viewport_id != ViewportId::MAIN && viewport_ui_cb.is_none() {
|
if viewport_id != ViewportId::MAIN && viewport_ui_cb.is_none() {
|
||||||
if let Some(viewport) = running.viewports.borrow().get(&parent_id) {
|
if let Some(viewport) = running.viewports.borrow().get(&parent_id) {
|
||||||
@@ -2543,10 +2564,19 @@ mod wgpu_integration {
|
|||||||
.retain(|_, id| active_viewports_ids.contains(id));
|
.retain(|_, id| active_viewports_ids.contains(id));
|
||||||
painter.borrow_mut().clean_surfaces(&active_viewports_ids);
|
painter.borrow_mut().clean_surfaces(&active_viewports_ids);
|
||||||
|
|
||||||
let Some((_, Viewport{window: Some(window), ..})) = viewport_maps.borrow().get(&window_id)
|
let Some((
|
||||||
.and_then(|id|viewports.borrow().get(id)
|
_,
|
||||||
.map(|w|(*id, w.clone()))
|
Viewport {
|
||||||
) else{return EventResult::Wait};
|
window: Some(window),
|
||||||
|
..
|
||||||
|
},
|
||||||
|
)) = viewport_maps
|
||||||
|
.borrow()
|
||||||
|
.get(&window_id)
|
||||||
|
.and_then(|id| viewports.borrow().get(id).map(|w| (*id, w.clone())))
|
||||||
|
else {
|
||||||
|
return EventResult::Wait;
|
||||||
|
};
|
||||||
integration
|
integration
|
||||||
.borrow_mut()
|
.borrow_mut()
|
||||||
.maybe_autosave(app.as_mut(), Some(&*window.borrow()));
|
.maybe_autosave(app.as_mut(), Some(&*window.borrow()));
|
||||||
|
|||||||
@@ -244,8 +244,14 @@ impl Painter {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
let Some(width) = NonZeroU32::new(size.width) else { eprintln!("The window width was zero, skip generate textures!"); return Ok(()) };
|
let Some(width) = NonZeroU32::new(size.width) else {
|
||||||
let Some(height) = NonZeroU32::new(size.height) else { eprintln!("The window height was zero, skip generate textures!"); return Ok(()) };
|
eprintln!("The window width was zero, skip generate textures!");
|
||||||
|
return Ok(());
|
||||||
|
};
|
||||||
|
let Some(height) = NonZeroU32::new(size.height) else {
|
||||||
|
eprintln!("The window height was zero, skip generate textures!");
|
||||||
|
return Ok(());
|
||||||
|
};
|
||||||
self.resize_and_generate_depth_texture_view_and_msaa_view(viewport_id, width, height);
|
self.resize_and_generate_depth_texture_view_and_msaa_view(viewport_id, width, height);
|
||||||
} else {
|
} else {
|
||||||
log::warn!("All surfaces was deleted!");
|
log::warn!("All surfaces was deleted!");
|
||||||
|
|||||||
@@ -438,7 +438,9 @@ fn generic_ui(ui: &mut egui::Ui, container_id: impl Into<Id>) {
|
|||||||
|
|
||||||
/// Move element ID to Viewport and col
|
/// Move element ID to Viewport and col
|
||||||
fn mov(&mut self, to: Id, col: usize) {
|
fn mov(&mut self, to: Id, col: usize) {
|
||||||
let Some(id) = self.is_dragged.take() else {return};
|
let Some(id) = self.is_dragged.take() else {
|
||||||
|
return;
|
||||||
|
};
|
||||||
assert!(col <= COLS, "The col should be less then: {COLS}");
|
assert!(col <= COLS, "The col should be less then: {COLS}");
|
||||||
|
|
||||||
// Should be a better way to do this!
|
// Should be a better way to do this!
|
||||||
|
|||||||
Reference in New Issue
Block a user