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

Remove another Rc<RefCell<T>>

Browse Source
This commit is contained in:
Konkitoman
2023-11-10 13:09:07 +02:00
parent 4ff713abde
commit 4539ebed61
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -491,7 +491,7 @@ mod glow_integration {
gl: Arc<glow::Context>, gl: Arc<glow::Context>,
painter: Rc<RefCell<egui_glow::Painter>>, painter: Rc<RefCell<egui_glow::Painter>>,
integration: epi_integration::EpiIntegration, integration: epi_integration::EpiIntegration,
app: Rc<RefCell<Box<dyn epi::App>>>, app: 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.
glutin_ctx: Rc<RefCell<GlutinWindowContext>>, glutin_ctx: Rc<RefCell<GlutinWindowContext>>,
@@ -1115,7 +1115,7 @@ mod glow_integration {
gl, gl,
painter, painter,
integration, integration,
app: Rc::new(RefCell::new(app)), app,
}); });
Ok(()) Ok(())
@@ -1404,7 +1404,7 @@ mod glow_integration {
crate::profile_function!(); crate::profile_function!();
running.integration.save( running.integration.save(
running.app.borrow_mut().as_mut(), running.app.as_mut(),
running running
.glutin_ctx .glutin_ctx
.borrow() .borrow()
@@ -1415,7 +1415,7 @@ mod glow_integration {
.map(|w| w.borrow()) .map(|w| w.borrow())
.as_deref(), .as_deref(),
); );
running.app.borrow_mut().on_exit(Some(&running.gl)); running.app.on_exit(Some(&running.gl));
running.painter.borrow_mut().destroy(); running.painter.borrow_mut().destroy();
} }
} }
@@ -1437,7 +1437,7 @@ mod glow_integration {
let running = self.running.as_mut().unwrap(); let running = self.running.as_mut().unwrap();
( (
&mut running.integration, &mut running.integration,
running.app.clone(), &mut running.app,
running.glutin_ctx.clone(), running.glutin_ctx.clone(),
running.painter.clone(), running.painter.clone(),
running.gl.clone(), running.gl.clone(),
@@ -1495,7 +1495,7 @@ mod glow_integration {
viewports, viewports,
viewport_commands, viewport_commands,
} = integration.update( } = integration.update(
app.borrow_mut().as_mut(), app.as_mut(),
&window, &window,
egui_winit, egui_winit,
&viewport.viewport_ui_cb.clone(), &viewport.viewport_ui_cb.clone(),
@@ -1528,8 +1528,7 @@ mod glow_integration {
egui_glow::painter::clear( egui_glow::painter::clear(
&gl, &gl,
screen_size_in_pixels, screen_size_in_pixels,
app.borrow() app.clear_color(&integration.egui_ctx.style().visuals),
.clear_color(&integration.egui_ctx.style().visuals),
); );
let pixels_per_point = integration let pixels_per_point = integration
@@ -1553,7 +1552,7 @@ mod glow_integration {
} }
integration.post_rendering( integration.post_rendering(
app.borrow_mut().as_mut(), app.as_mut(),
&viewport.borrow().window.as_ref().unwrap().borrow(), &viewport.borrow().window.as_ref().unwrap().borrow(),
); );
} }
@@ -1610,7 +1609,7 @@ mod glow_integration {
}; };
integration.maybe_autosave( integration.maybe_autosave(
app.borrow_mut().as_mut(), app.as_mut(),
viewport viewport
.borrow() .borrow()
.window .window
@@ -1790,7 +1789,7 @@ mod glow_integration {
let viewport = &mut *viewport.borrow_mut(); let viewport = &mut *viewport.borrow_mut();
break 'res running.integration.on_event( break 'res running.integration.on_event(
running.app.borrow_mut().as_mut(), running.app.as_mut(),
event, event,
viewport.egui_winit.as_mut().unwrap(), viewport.egui_winit.as_mut().unwrap(),
viewport.id_pair.this, viewport.id_pair.this,