migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-02 14:50:03 -04:00
Code Activity

Remove some clones

Browse Source
This commit is contained in:
Emil Ernerfeldt
2023-11-11 19:06:04 +01:00
parent 3d6ca6cf14
commit 9c420b9644
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
crates/eframe/src/native/run.rs
View File

@@ -1181,7 +1181,7 @@ mod glow_integration {
let Some(winit_state) = &mut viewport.egui_winit else { let Some(winit_state) = &mut viewport.egui_winit else {
return; return;
}; };
let Some(window) = viewport.window.clone() else { let Some(window) = &viewport.window else {
return; return;
}; };
let window = window.borrow(); let window = window.borrow();
@@ -1277,7 +1277,7 @@ mod glow_integration {
if recreate { if recreate {
viewport.window = None; viewport.window = None;
viewport.gl_surface = None; viewport.gl_surface = None;
} else if let Some(w) = viewport.window.clone() { } else if let Some(w) = &viewport.window {
process_viewport_commands(commands, *id, None, &w.borrow()); process_viewport_commands(commands, *id, None, &w.borrow());
} }
active_viewports_ids.insert(*id); active_viewports_ids.insert(*id);
@@ -1602,18 +1602,15 @@ mod glow_integration {
Self::process_viewport_builders(&glutin, viewports); Self::process_viewport_builders(&glutin, viewports);
for (viewport_id, command) in viewport_commands { for (viewport_id, command) in viewport_commands {
if let Some(window) = glutin if let Some(viewport) = glutin.borrow().viewports.get(&viewport_id) {
.borrow() if let Some(window) = &viewport.borrow().window {
.viewports egui_winit::process_viewport_commands(
.get(&viewport_id) vec![command],
.and_then(|viewport| viewport.borrow().window.clone()) viewport_id,
{ *self.focused_viewport.borrow(),
egui_winit::process_viewport_commands( &window.borrow(),
vec![command], );
viewport_id, }
*self.focused_viewport.borrow(),
&window.borrow(),
);
} }
} }