migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-30 13:20:05 -04:00
Code Activity

eframe: refactor code to be more compact and faster

Browse Source
This commit is contained in:
Konkitoman
2023-10-11 21:08:07 +03:00
parent e21ed4ff1f
commit 954366ef7f
1 changed files with 90 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -534,7 +534,9 @@ mod glow_integration {
not_current_gl_context: Option<glutin::context::NotCurrentContext>, not_current_gl_context: Option<glutin::context::NotCurrentContext>,
viewports: HashMap<ViewportId, Arc<RwLock<Window>>>, viewports: HashMap<ViewportId, Arc<RwLock<Window>>>,
viewports_maps: HashMap<winit::window::WindowId, ViewportId>, viewport_maps: HashMap<winit::window::WindowId, ViewportId>,
window_maps: HashMap<ViewportId, winit::window::WindowId>,
builders: HashMap<ViewportId, ViewportBuilder>, builders: HashMap<ViewportId, ViewportBuilder>,
} }
@@ -657,9 +659,11 @@ mod glow_integration {
}; };
let not_current_gl_context = Some(gl_context); let not_current_gl_context = Some(gl_context);
let mut viewport_maps = HashMap::default();
let mut window_maps = HashMap::default(); let mut window_maps = HashMap::default();
if let Some(window) = &window { if let Some(window) = &window {
window_maps.insert(window.id(), ViewportId::MAIN); viewport_maps.insert(window.id(), ViewportId::MAIN);
window_maps.insert(ViewportId::MAIN, window.id());
} }
let mut windows = HashMap::default(); let mut windows = HashMap::default();
@@ -688,9 +692,10 @@ mod glow_integration {
not_current_gl_context, not_current_gl_context,
viewports: windows, viewports: windows,
builders, builders,
viewports_maps: window_maps, viewport_maps,
// This is initialize in init_run_state // This is initialize in init_run_state
max_texture_side: 0, max_texture_side: 0,
window_maps,
}) })
} }
@@ -793,7 +798,8 @@ mod glow_integration {
win.gl_surface = Some(gl_surface); win.gl_surface = Some(gl_surface);
self.current_gl_context = Some(current_gl_context); self.current_gl_context = Some(current_gl_context);
self.viewports_maps.insert(window.id(), win.pair.this); self.viewport_maps.insert(window.id(), win.pair.this);
self.window_maps.insert(win.pair.this, window.id());
} }
win.window = Some(window); win.window = Some(window);
Ok(()) Ok(())
@@ -1280,16 +1286,19 @@ mod glow_integration {
active_viewports_ids.push(pair.this); active_viewports_ids.push(pair.this);
} }
let mut gl_window = glutin_ctx.write(); let mut glutin = glutin_ctx.write();
gl_window glutin
.viewports .viewports
.retain(|id, _| active_viewports_ids.contains(id)); .retain(|id, _| active_viewports_ids.contains(id));
gl_window glutin
.builders .builders
.retain(|id, _| active_viewports_ids.contains(id)); .retain(|id, _| active_viewports_ids.contains(id));
gl_window glutin
.viewports_maps .viewport_maps
.retain(|_, id| active_viewports_ids.contains(id)); .retain(|_, id| active_viewports_ids.contains(id));
glutin
.window_maps
.retain(|id, _| active_viewports_ids.contains(id));
} }
} }
@@ -1304,8 +1313,7 @@ mod glow_integration {
fn is_focused(&self, window_id: winit::window::WindowId) -> bool { fn is_focused(&self, window_id: winit::window::WindowId) -> bool {
if let Some(is_focused) = self.is_focused.read().as_ref() { if let Some(is_focused) = self.is_focused.read().as_ref() {
if let Some(running) = self.running.read().as_ref() { if let Some(running) = self.running.read().as_ref() {
if let Some(window_id) = if let Some(window_id) = running.glutin_ctx.read().viewport_maps.get(&window_id)
running.glutin_ctx.read().viewports_maps.get(&window_id)
{ {
return *is_focused == *window_id; return *is_focused == *window_id;
} }
@@ -1324,7 +1332,7 @@ mod glow_integration {
) -> Option<Arc<RwLock<winit::window::Window>>> { ) -> Option<Arc<RwLock<winit::window::Window>>> {
self.running.read().as_ref().and_then(|r| { self.running.read().as_ref().and_then(|r| {
let glutin_ctx = r.glutin_ctx.read(); let glutin_ctx = r.glutin_ctx.read();
if let Some(viewport_id) = glutin_ctx.viewports_maps.get(&window_id) { if let Some(viewport_id) = glutin_ctx.viewport_maps.get(&window_id) {
if let Some(viewport) = glutin_ctx.viewports.get(viewport_id) { if let Some(viewport) = glutin_ctx.viewports.get(viewport_id) {
if let Some(window) = viewport.read().window.as_ref() { if let Some(window) = viewport.read().window.as_ref() {
return Some(window.clone()); return Some(window.clone());
@@ -1336,19 +1344,17 @@ mod glow_integration {
} }
fn get_window_winit_id(&self, id: ViewportId) -> Option<winit::window::WindowId> { fn get_window_winit_id(&self, id: ViewportId) -> Option<winit::window::WindowId> {
self.running.read().as_ref().and_then(|r| { self.running
if let Some(window) = r.glutin_ctx.read().viewports.get(&id) { .read()
return window.read().window.as_ref().map(|w| w.read().id()); .as_ref()
} .and_then(|r| r.glutin_ctx.read().window_maps.get(&id).copied())
None
})
} }
fn get_window_id(&self, id: &winit::window::WindowId) -> Option<ViewportId> { fn get_window_id(&self, id: &winit::window::WindowId) -> Option<ViewportId> {
self.running self.running
.read() .read()
.as_ref() .as_ref()
.and_then(|r| r.glutin_ctx.read().viewports_maps.get(id).copied()) .and_then(|r| r.glutin_ctx.read().viewport_maps.get(id).copied())
} }
fn save_and_destroy(&mut self) { fn save_and_destroy(&mut self) {
@@ -1395,24 +1401,20 @@ mod glow_integration {
// This will only happen if the viewport is sync // This will only happen if the viewport is sync
// That means that the viewport cannot be rendered by itself and needs his parent to be rendered // That means that the viewport cannot be rendered by itself and needs his parent to be rendered
{ {
let win = &glutin.read().viewports[&viewport_id].clone(); let glutin = glutin.read();
if win.read().render.is_none() && viewport_id != ViewportId::MAIN { let viewport = &glutin.viewports[&viewport_id].clone();
if let Some(win) = glutin.read().viewports.get(&win.read().pair.parent) { if viewport.read().render.is_none() && viewport_id != ViewportId::MAIN {
if let Some(w) = win.read().window.as_ref() { if let Some(parent_viewport) =
return vec![EventResult::RepaintNow(w.read().id())]; glutin.viewports.get(&viewport.read().pair.parent)
{
if let Some(window) = parent_viewport.read().window.as_ref() {
return vec![EventResult::RepaintNow(window.read().id())];
} }
} }
return vec![]; return vec![];
} }
} }
let mut window_map = HashMap::default();
for (id, window) in &glutin.read().viewports {
if let Some(win) = &window.read().window {
window_map.insert(*id, win.read().id());
}
}
let egui::FullOutput { let egui::FullOutput {
platform_output, platform_output,
repaint_after, repaint_after,
@@ -1554,33 +1556,37 @@ mod glow_integration {
} }
} }
control_flow = if integration.should_close() { {
vec![EventResult::Exit] let glutin = glutin.read();
} else { let window_maps = &glutin.window_maps;
repaint_after
.into_iter()
.filter_map(|(id, time)| {
if time.is_zero() {
window_map.get(&id).map(|id| EventResult::RepaintNext(*id))
} else if let Some(repaint_after_instant) =
std::time::Instant::now().checked_add(time)
{
// if repaint_after is something huge and can't be added to Instant,
// we will use `ControlFlow::Wait` instead.
// technically, this might lead to some weird corner cases where the user *WANTS*
// winit to use `WaitUntil(MAX_INSTANT)` explicitly. they can roll their own
// egui backend impl i guess.
window_map.get(&id).map(|id| { control_flow = if integration.should_close() {
EventResult::RepaintAt(*id, repaint_after_instant) vec![EventResult::Exit]
}) } else {
} else { repaint_after
None .into_iter()
} .filter_map(|(id, time)| {
}) if time.is_zero() {
.collect::<Vec<EventResult>>() window_maps.get(&id).map(|id| EventResult::RepaintNext(*id))
}; } else if let Some(repaint_after_instant) =
std::time::Instant::now().checked_add(time)
{
// if repaint_after is something huge and can't be added to Instant,
// we will use `ControlFlow::Wait` instead.
// technically, this might lead to some weird corner cases where the user *WANTS*
// winit to use `WaitUntil(MAX_INSTANT)` explicitly. they can roll their own
// egui backend impl i guess.
window_maps.get(&id).map(|id| {
EventResult::RepaintAt(*id, repaint_after_instant)
})
} else {
None
}
})
.collect::<Vec<EventResult>>()
};
}
integration integration
.maybe_autosave(app.write().as_mut(), win.read().window.clone().unwrap()); .maybe_autosave(app.write().as_mut(), win.read().window.clone().unwrap());
@@ -1643,13 +1649,10 @@ mod glow_integration {
.unwrap() .unwrap()
.glutin_ctx .glutin_ctx
.read() .read()
.window(ViewportId::MAIN) .window_maps
.read() .get(&ViewportId::MAIN)
.window .copied()
.as_ref() .unwrap(),
.unwrap()
.read()
.id(),
) )
} }
winit::event::Event::Suspended => { winit::event::Event::Suspended => {
@@ -1695,7 +1698,7 @@ mod glow_integration {
running running
.glutin_ctx .glutin_ctx
.write() .write()
.viewports_maps .viewport_maps
.get(window_id) .get(window_id)
.copied() .copied()
}) })
@@ -1707,10 +1710,10 @@ mod glow_integration {
// Resize with 0 width and height is used by winit to signal a minimize event on Windows. // Resize with 0 width and height is used by winit to signal a minimize event on Windows.
// See: https://github.com/rust-windowing/winit/issues/208 // See: https://github.com/rust-windowing/winit/issues/208
// This solves an issue where the app would panic when minimizing on Windows. // This solves an issue where the app would panic when minimizing on Windows.
let glutin_ctx = &mut *running.glutin_ctx.write(); let glutin = &mut *running.glutin_ctx.write();
if 0 < physical_size.width && 0 < physical_size.height { if 0 < physical_size.width && 0 < physical_size.height {
if let Some(id) = glutin_ctx.viewports_maps.get(window_id) { if let Some(id) = glutin.viewport_maps.get(window_id) {
glutin_ctx.resize(*id, *physical_size); glutin.resize(*id, *physical_size);
} }
} }
} }
@@ -1718,39 +1721,19 @@ mod glow_integration {
new_inner_size, new_inner_size,
.. ..
} => { } => {
let glutin_ctx = &mut *running.glutin_ctx.write(); let glutin = &mut *running.glutin_ctx.write();
repaint_asap = true; repaint_asap = true;
if let Some(id) = glutin_ctx.viewports_maps.get(window_id) { if let Some(id) = glutin.viewport_maps.get(window_id) {
glutin_ctx.resize(*id, **new_inner_size); glutin.resize(*id, **new_inner_size);
} }
} }
winit::event::WindowEvent::CloseRequested winit::event::WindowEvent::CloseRequested
if running if running
.glutin_ctx .glutin_ctx
.write() .read()
.viewports .viewport_maps
.iter() .get(window_id)
.filter_map(|(_, window)| { .map_or(false, |id| *id == ViewportId::MAIN)
if let Some(win) = window.read().window.as_ref() {
let win = win.read();
if win.id() == *window_id {
Some(window.read().pair.this)
} else {
None
}
} else {
None
}
})
.filter_map(|id| {
if id == ViewportId::MAIN {
Some(())
} else {
None
}
})
.count()
== 1
&& running.integration.read().should_close() => && running.integration.read().should_close() =>
{ {
log::debug!("Received WindowEvent::CloseRequested"); log::debug!("Received WindowEvent::CloseRequested");
@@ -1760,12 +1743,10 @@ mod glow_integration {
} }
let event_response = 'res: { let event_response = 'res: {
let glutin_ctx = running.glutin_ctx.read(); let glutin = running.glutin_ctx.read();
if let Some(viewport_id) = if let Some(viewport_id) = glutin.viewport_maps.get(window_id).copied()
glutin_ctx.viewports_maps.get(window_id).copied()
{ {
if let Some(viewport) = if let Some(viewport) = glutin.viewports.get(&viewport_id).cloned()
glutin_ctx.viewports.get(&viewport_id).cloned()
{ {
let viewport = &mut *viewport.write(); let viewport = &mut *viewport.write();
@@ -1807,11 +1788,9 @@ mod glow_integration {
if let Some(running) = self.running.read().as_ref() { if let Some(running) = self.running.read().as_ref() {
crate::profile_scope!("on_accesskit_action_request"); crate::profile_scope!("on_accesskit_action_request");
let glutin_ctx = running.glutin_ctx.read(); let glutin = running.glutin_ctx.read();
if let Some(viewport_id) = glutin_ctx.viewports_maps.get(window_id).copied() if let Some(viewport_id) = glutin.viewport_maps.get(window_id).copied() {
{ if let Some(viewport) = glutin.viewports.get(&viewport_id).cloned() {
if let Some(viewport) = glutin_ctx.viewports.get(&viewport_id).cloned()
{
let mut viewport = viewport.write(); let mut viewport = viewport.write();
viewport viewport
.egui_winit .egui_winit
@@ -2522,7 +2501,10 @@ mod wgpu_integration {
}); });
} }
let Some((_, Window{window: Some(window), ..})) = windows_id.read().get(&window_id).and_then(|id|(windows.read().get(id).map(|w|(*id, w.clone())))) else{return vec![]}; let Some((_, Window{window: Some(window), ..})) = windows_id.read().get(&window_id)
.and_then(|id|windows.read().get(id)
.map(|w|(*id, w.clone()))
) else{return vec![]};
integration integration
.write() .write()
.maybe_autosave(app.as_mut(), window.clone()); .maybe_autosave(app.as_mut(), window.clone());
@@ -2661,9 +2643,9 @@ mod wgpu_integration {
_ => {} _ => {}
}; };
let event_response = if let Some((id, Window { state, .. })) = let event_response = if let Some((id, Window { state, .. })) = viewport_id
running.windows_id.read().get(window_id).and_then(|id| { .and_then(|id| {
running.viewports.read().get(id).map(|w| (*id, w.clone())) running.viewports.read().get(&id).map(|w| (id, w.clone()))
}) { }) {
if let Some(state) = &mut *state.write() { if let Some(state) = &mut *state.write() {
Some(running.integration.write().on_event( Some(running.integration.write().on_event(