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

Fix small memory leak

Browse Source 
Now windows that do not exist will not be able to stay in redraw requests
This commit is contained in:
Konkitoman
2023-07-25 09:48:12 +03:00
parent 199d4e53cd
commit 86068c6590
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1156,7 +1156,7 @@ mod glow_integration {
} else { } else {
repaint_after repaint_after
.into_iter() .into_iter()
.map(|(id, time)| { .flat_map(|(id, time)| {
if time.is_zero() { if time.is_zero() {
if let Some(id) = window_map.get(&id) { if let Some(id) = window_map.get(&id) {
Some(EventResult::RepaintNext(*id)) Some(EventResult::RepaintNext(*id))
@@ -1181,7 +1181,6 @@ mod glow_integration {
None None
} }
}) })
.flatten()
.collect::<Vec<EventResult>>() .collect::<Vec<EventResult>>()
}; };

21
crates/egui/src/context.rs
View File

@@ -125,7 +125,11 @@ impl Repaint {
} }
// returns how long to wait until repaint // returns how long to wait until repaint
fn end_frame(&mut self, viewport_id: u64) -> Vec<(u64, std::time::Duration)> { fn end_frame(
&mut self,
viewport_id: u64,
viewports: Vec<u64>,
) -> Vec<(u64, std::time::Duration)> {
// if repaint_requests is greater than zero. just set the duration to zero for immediate // if repaint_requests is greater than zero. just set the duration to zero for immediate
// repaint. if there's no repaint requests, then we can use the actual repaint_after instead. // repaint. if there's no repaint requests, then we can use the actual repaint_after instead.
let repaint_after = if self.repaint_requests > 0 { let repaint_after = if self.repaint_requests > 0 {
@@ -142,6 +146,8 @@ impl Repaint {
self.requested_repaint_last_frame = repaint_after.is_zero(); self.requested_repaint_last_frame = repaint_after.is_zero();
self.frame_nr += 1; self.frame_nr += 1;
self.repaint_after.retain(|id, _| viewports.contains(id));
self.repaint_after self.repaint_after
.iter() .iter()
.map(|(id, time)| (*id, *time)) .map(|(id, time)| (*id, *time))
@@ -1301,7 +1307,18 @@ impl Context {
} }
} }
let repaint_after = self.write(|ctx| ctx.repaint.end_frame(ctx.current_rendering_viewport)); let mut viewports: Vec<u64> = self.read(|ctx| {
ctx.viewports
.iter()
.map(|(_, (_, id, _, _, _))| *id)
.collect()
});
viewports.push(0);
let repaint_after = self.write(|ctx| {
ctx.repaint
.end_frame(ctx.current_rendering_viewport, viewports)
});
let shapes = self.drain_paint_lists(); let shapes = self.drain_paint_lists();
// This is used for, // This is used for,