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

Removed more unused Rc<RefCell<T>>

Browse Source
This commit is contained in:
Konkitoman
2023-11-10 12:59:31 +02:00
parent 8a4164288b
commit 4ff713abde
1 changed files with 38 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,7 +96,7 @@ trait WinitApp {
fn is_focused(&self, window_id: winit::window::WindowId) -> bool; fn is_focused(&self, window_id: winit::window::WindowId) -> bool;
fn integration(&self) -> Option<Rc<RefCell<EpiIntegration>>>; fn integration(&self) -> Option<&EpiIntegration>;
fn window( fn window(
&self, &self,
@@ -490,7 +490,7 @@ mod glow_integration {
struct GlowWinitRunning { struct GlowWinitRunning {
gl: Arc<glow::Context>, gl: Arc<glow::Context>,
painter: Rc<RefCell<egui_glow::Painter>>, painter: Rc<RefCell<egui_glow::Painter>>,
integration: Rc<RefCell<epi_integration::EpiIntegration>>, integration: epi_integration::EpiIntegration,
app: Rc<RefCell<Box<dyn epi::App>>>, app: Rc<RefCell<Box<dyn epi::App>>>,
// Conceptually this will be split out eventually so that the rest of the state // Conceptually this will be split out eventually so that the rest of the state
// can be persistent. // can be persistent.
@@ -1114,7 +1114,7 @@ mod glow_integration {
glutin_ctx, glutin_ctx,
gl, gl,
painter, painter,
integration: Rc::new(RefCell::new(integration)), integration,
app: Rc::new(RefCell::new(app)), app: Rc::new(RefCell::new(app)),
}); });
@@ -1347,9 +1347,9 @@ mod glow_integration {
impl WinitApp for GlowWinitApp { impl WinitApp for GlowWinitApp {
fn frame_nr(&self, viewport_id: ViewportId) -> u64 { fn frame_nr(&self, viewport_id: ViewportId) -> u64 {
self.running.as_ref().map_or(0, |r| { self.running
r.integration.borrow().egui_ctx.frame_nr_for(viewport_id) .as_ref()
}) .map_or(0, |r| r.integration.egui_ctx.frame_nr_for(viewport_id))
} }
fn is_focused(&self, window_id: winit::window::WindowId) -> bool { fn is_focused(&self, window_id: winit::window::WindowId) -> bool {
@@ -1365,8 +1365,8 @@ mod glow_integration {
false false
} }
fn integration(&self) -> Option<Rc<RefCell<EpiIntegration>>> { fn integration(&self) -> Option<&EpiIntegration> {
self.running.as_ref().map(|r| r.integration.clone()) self.running.as_ref().map(|r| &r.integration)
} }
fn window( fn window(
@@ -1400,10 +1400,10 @@ mod glow_integration {
fn save_and_destroy(&mut self) { fn save_and_destroy(&mut self) {
crate::profile_function!(); crate::profile_function!();
if let Some(running) = self.running.take() { if let Some(mut running) = self.running.take() {
crate::profile_function!(); crate::profile_function!();
running.integration.borrow_mut().save( running.integration.save(
running.app.borrow_mut().as_mut(), running.app.borrow_mut().as_mut(),
running running
.glutin_ctx .glutin_ctx
@@ -1433,13 +1433,14 @@ mod glow_integration {
puffin::GlobalProfiler::lock().new_frame(); puffin::GlobalProfiler::lock().new_frame();
crate::profile_scope!("frame"); crate::profile_scope!("frame");
let (integration, app, glutin, painter) = { let (integration, app, glutin, painter, gl) = {
let running = self.running.as_ref().unwrap(); let running = self.running.as_mut().unwrap();
( (
running.integration.clone(), &mut running.integration,
running.app.clone(), running.app.clone(),
running.glutin_ctx.clone(), running.glutin_ctx.clone(),
running.painter.clone(), running.painter.clone(),
running.gl.clone(),
) )
}; };
@@ -1493,7 +1494,7 @@ mod glow_integration {
shapes, shapes,
viewports, viewports,
viewport_commands, viewport_commands,
} = integration.borrow_mut().update( } = integration.update(
app.borrow_mut().as_mut(), app.borrow_mut().as_mut(),
&window, &window,
egui_winit, egui_winit,
@@ -1501,7 +1502,7 @@ mod glow_integration {
viewport.id_pair, viewport.id_pair,
); );
integration.borrow_mut().handle_platform_output( integration.handle_platform_output(
&window, &window,
viewport_id, viewport_id,
platform_output, platform_output,
@@ -1509,7 +1510,7 @@ mod glow_integration {
); );
} }
let clipped_primitives = integration.borrow().egui_ctx.tessellate(shapes); let clipped_primitives = integration.egui_ctx.tessellate(shapes);
{ {
let mut glutin = glutin.borrow_mut(); let mut glutin = glutin.borrow_mut();
glutin.current_gl_context = Some( glutin.current_gl_context = Some(
@@ -1524,17 +1525,14 @@ mod glow_integration {
); );
}; };
let gl = self.running.as_ref().unwrap().gl.clone();
egui_glow::painter::clear( egui_glow::painter::clear(
&gl, &gl,
screen_size_in_pixels, screen_size_in_pixels,
app.borrow() app.borrow()
.clear_color(&integration.borrow().egui_ctx.style().visuals), .clear_color(&integration.egui_ctx.style().visuals),
); );
let pixels_per_point = integration let pixels_per_point = integration
.borrow()
.egui_ctx .egui_ctx
.input_for(viewport_id, |i| i.pixels_per_point()); .input_for(viewport_id, |i| i.pixels_per_point());
@@ -1545,7 +1543,6 @@ mod glow_integration {
&textures_delta, &textures_delta,
); );
let mut integration = integration.borrow_mut();
{ {
let screenshot_requested = &mut integration.frame.output.screenshot_requested; let screenshot_requested = &mut integration.frame.output.screenshot_requested;
@@ -1776,7 +1773,7 @@ mod glow_integration {
.viewport_maps .viewport_maps
.get(window_id) .get(window_id)
.map_or(false, |id| *id == ViewportId::ROOT) .map_or(false, |id| *id == ViewportId::ROOT)
&& running.integration.borrow().should_close() => && running.integration.should_close() =>
{ {
log::debug!("Received WindowEvent::CloseRequested"); log::debug!("Received WindowEvent::CloseRequested");
return Ok(EventResult::Exit); return Ok(EventResult::Exit);
@@ -1792,7 +1789,7 @@ mod glow_integration {
{ {
let viewport = &mut *viewport.borrow_mut(); let viewport = &mut *viewport.borrow_mut();
break 'res running.integration.borrow_mut().on_event( break 'res running.integration.on_event(
running.app.borrow_mut().as_mut(), running.app.borrow_mut().as_mut(),
event, event,
viewport.egui_winit.as_mut().unwrap(), viewport.egui_winit.as_mut().unwrap(),
@@ -1807,7 +1804,7 @@ mod glow_integration {
} }
}; };
if running.integration.borrow().should_close() { if running.integration.should_close() {
EventResult::Exit EventResult::Exit
} else if event_response.repaint { } else if event_response.repaint {
if repaint_asap { if repaint_asap {
@@ -1905,7 +1902,7 @@ mod wgpu_integration {
/// initialized once the application has an associated `SurfaceView`. /// initialized once the application has an associated `SurfaceView`.
struct WgpuWinitRunning { struct WgpuWinitRunning {
painter: Rc<RefCell<egui_wgpu::winit::Painter>>, painter: Rc<RefCell<egui_wgpu::winit::Painter>>,
integration: Rc<RefCell<epi_integration::EpiIntegration>>, integration: epi_integration::EpiIntegration,
app: Box<dyn epi::App>, app: Box<dyn epi::App>,
viewports: Rc<RefCell<Viewports>>, viewports: Rc<RefCell<Viewports>>,
builders: Rc<RefCell<ViewportIdMap<ViewportBuilder>>>, builders: Rc<RefCell<ViewportIdMap<ViewportBuilder>>>,
@@ -2215,7 +2212,7 @@ mod wgpu_integration {
self.running = Some(WgpuWinitRunning { self.running = Some(WgpuWinitRunning {
painter, painter,
integration: Rc::new(RefCell::new(integration)), integration,
app, app,
viewports, viewports,
viewport_maps, viewport_maps,
@@ -2332,9 +2329,9 @@ mod wgpu_integration {
impl WinitApp for WgpuWinitApp { impl WinitApp for WgpuWinitApp {
fn frame_nr(&self, viewport_id: ViewportId) -> u64 { fn frame_nr(&self, viewport_id: ViewportId) -> u64 {
self.running.as_ref().map_or(0, |r| { self.running
r.integration.borrow().egui_ctx.frame_nr_for(viewport_id) .as_ref()
}) .map_or(0, |r| r.integration.egui_ctx.frame_nr_for(viewport_id))
} }
fn is_focused(&self, window_id: winit::window::WindowId) -> bool { fn is_focused(&self, window_id: winit::window::WindowId) -> bool {
@@ -2346,8 +2343,8 @@ mod wgpu_integration {
} }
} }
fn integration(&self) -> Option<Rc<RefCell<EpiIntegration>>> { fn integration(&self) -> Option<&EpiIntegration> {
self.running.as_ref().map(|r| r.integration.clone()) self.running.as_ref().map(|r| &r.integration)
} }
fn window( fn window(
@@ -2380,7 +2377,7 @@ mod wgpu_integration {
if let Some(Viewport { window, .. }) = if let Some(Viewport { window, .. }) =
running.viewports.borrow().get(&ViewportId::ROOT) running.viewports.borrow().get(&ViewportId::ROOT)
{ {
running.integration.borrow_mut().save( running.integration.save(
running.app.as_mut(), running.app.as_mut(),
window.as_ref().map(|w| w.borrow()).as_deref(), window.as_ref().map(|w| w.borrow()).as_deref(),
); );
@@ -2460,7 +2457,7 @@ mod wgpu_integration {
shapes, shapes,
viewports: out_viewports, viewports: out_viewports,
viewport_commands, viewport_commands,
} = integration.borrow_mut().update( } = integration.update(
app.as_mut(), app.as_mut(),
&window.borrow(), &window.borrow(),
state.borrow_mut().as_mut().unwrap(), state.borrow_mut().as_mut().unwrap(),
@@ -2471,16 +2468,15 @@ mod wgpu_integration {
}, },
); );
integration.borrow_mut().handle_platform_output( integration.handle_platform_output(
&window.borrow(), &window.borrow(),
viewport_id, viewport_id,
platform_output, platform_output,
state.borrow_mut().as_mut().unwrap(), state.borrow_mut().as_mut().unwrap(),
); );
let clipped_primitives = integration.borrow().egui_ctx.tessellate(shapes); let clipped_primitives = integration.egui_ctx.tessellate(shapes);
let integration = &mut *integration.borrow_mut();
let screenshot_requested = &mut integration.frame.output.screenshot_requested; let screenshot_requested = &mut integration.frame.output.screenshot_requested;
let pixels_per_point = integration let pixels_per_point = integration
@@ -2604,9 +2600,7 @@ mod wgpu_integration {
else { else {
return EventResult::Wait; return EventResult::Wait;
}; };
integration integration.maybe_autosave(app.as_mut(), Some(&*window.borrow()));
.borrow_mut()
.maybe_autosave(app.as_mut(), Some(&*window.borrow()));
if window.borrow().is_minimized() == Some(true) { if window.borrow().is_minimized() == Some(true) {
// On Mac, a minimized Window uses up all CPU: // On Mac, a minimized Window uses up all CPU:
@@ -2615,7 +2609,7 @@ mod wgpu_integration {
std::thread::sleep(std::time::Duration::from_millis(10)); std::thread::sleep(std::time::Duration::from_millis(10));
} }
if integration.borrow().should_close() { if integration.should_close() {
EventResult::Exit EventResult::Exit
} else { } else {
EventResult::Wait EventResult::Wait
@@ -2636,7 +2630,7 @@ mod wgpu_integration {
if running.viewports.borrow().get(&ViewportId::ROOT).is_none() { if running.viewports.borrow().get(&ViewportId::ROOT).is_none() {
let _ = Self::create_window( let _ = Self::create_window(
event_loop, event_loop,
running.integration.borrow().frame.storage(), running.integration.frame.storage(),
&self.app_name, &self.app_name,
&mut self.native_options, &mut self.native_options,
)?; )?;
@@ -2740,7 +2734,7 @@ mod wgpu_integration {
} }
} }
winit::event::WindowEvent::CloseRequested winit::event::WindowEvent::CloseRequested
if running.integration.borrow().should_close() => if running.integration.should_close() =>
{ {
log::debug!("Received WindowEvent::CloseRequested"); log::debug!("Received WindowEvent::CloseRequested");
return Ok(EventResult::Exit); return Ok(EventResult::Exit);
@@ -2753,7 +2747,7 @@ mod wgpu_integration {
running.viewports.borrow().get(&id).map(|w| (id, w.clone())) running.viewports.borrow().get(&id).map(|w| (id, w.clone()))
}) { }) {
if let Some(state) = &mut *viewport.egui_winit.borrow_mut() { if let Some(state) = &mut *viewport.egui_winit.borrow_mut() {
Some(running.integration.borrow_mut().on_event( Some(running.integration.on_event(
running.app.as_mut(), running.app.as_mut(),
event, event,
state, state,
@@ -2766,7 +2760,7 @@ mod wgpu_integration {
None None
}; };
if running.integration.borrow().should_close() { if running.integration.should_close() {
EventResult::Exit EventResult::Exit
} else if let Some(event_response) = event_response { } else if let Some(event_response) = event_response {
if event_response.repaint { if event_response.repaint {