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

Naming: state -> egui_winit

Browse Source
This commit is contained in:
Emil Ernerfeldt
2023-11-12 16:58:35 +01:00
parent df78a2d4c9
commit 10dce1c7a6
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2186,9 +2186,7 @@ mod wgpu_integration {
} }
let Viewport { let Viewport {
window, window, egui_winit, ..
egui_winit: state,
..
} = viewports.entry(id_pair.this).or_insert(Viewport { } = viewports.entry(id_pair.this).or_insert(Viewport {
window: None, window: None,
egui_winit: Rc::new(RefCell::new(None)), egui_winit: Rc::new(RefCell::new(None)),
@@ -2205,7 +2203,7 @@ mod wgpu_integration {
viewport_maps, viewport_maps,
painter, painter,
window, window,
&mut state.borrow_mut(), &mut egui_winit.borrow_mut(),
event_loop, event_loop,
); );
} }
@@ -2696,11 +2694,11 @@ mod wgpu_integration {
.get(&id) .get(&id)
.map(|w| (id, w.clone())) .map(|w| (id, w.clone()))
}) { }) {
if let Some(state) = &mut *viewport.egui_winit.borrow_mut() { if let Some(egui_winit) = &mut *viewport.egui_winit.borrow_mut() {
Some(running.integration.on_event( Some(running.integration.on_event(
running.app.as_mut(), running.app.as_mut(),
event, event,
state, egui_winit,
id, id,
)) ))
} else { } else {
@@ -2740,8 +2738,8 @@ mod wgpu_integration {
.get(window_id) .get(window_id)
.and_then(|id| shared.viewports.get(id).cloned()) .and_then(|id| shared.viewports.get(id).cloned())
{ {
if let Some(state) = &mut *viewport.egui_winit.borrow_mut() { if let Some(egui_winit) = &mut *viewport.egui_winit.borrow_mut() {
state.on_accesskit_action_request(request.clone()); egui_winit.on_accesskit_action_request(request.clone());
} }
} }
// As a form of user input, accessibility actions should // As a form of user input, accessibility actions should