migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-06-28 07:23:13 -04:00
Code Activity

Fix: sync viewport was not updating on windows

Browse Source 
Changes: no more manual calls to winit:🪟:Window::request_redraw, in glow or wgpu
This commit is contained in:
Konkitoman
2023-08-29 11:01:19 +03:00
parent a21cb80f56
commit 51011d1bbd
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,8 +147,6 @@ fn run_and_return(
log::debug!("Entering the winit event loop (run_return)…");
println!("Run and return");
let mut windows_next_repaint_times = HashMap::default();
let mut returned_result = Ok(());
@@ -310,8 +308,6 @@ fn run_and_exit(event_loop: EventLoop<UserEvent>, mut winit_app: impl WinitApp +
let mut windows_next_repaint_times = HashMap::default();
println!("Run and exit");
event_loop.run(move |event, event_loop, control_flow| {
let events = match event {
winit::event::Event::LoopDestroyed => {
@@ -735,7 +731,6 @@ mod glow_integration {
win.gl_surface = Some(gl_surface);
self.current_gl_context = Some(current_gl_context);
self.window_maps.insert(window.id(), win.window_id);
window.request_redraw();
}
win.window = Some(window);
}
@@ -1273,7 +1268,7 @@ mod glow_integration {
if win.read().render.is_none() && viewport_id != ViewportId::MAIN {
if let Some(win) = glutin_ctx.read().windows.get(&win.read().parent_id) {
if let Some(w) = win.read().window.as_ref() {
w.read().request_redraw();
return vec![EventResult::RepaintNow(w.read().id())];
}
}
return vec![];
@@ -2183,7 +2178,7 @@ mod wgpu_integration {
if viewport_id != ViewportId::MAIN && render.is_none() {
if let Some(window) = running.windows.read().get(&parent_viewport_id) {
if let Some(w) = window.0.as_ref() {
w.read().request_redraw();
return vec![EventResult::RepaintNow(w.read().id())];
}
}
return vec![];