djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup CtxRef::run with CtxRef::mutate helper

Browse source
This commit is contained in:
Emil Ernerfeldt 2021-11-10 11:33:15 +01:00
parent 360b83e8f7
commit 19264c8043
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
egui/src/context.rs
View file

@ -107,13 +107,13 @@ impl CtxRef {
) -> (Output, Vec<ClippedShape>) {
self.memory().begin_frame(&self.input, &new_raw_input);
let mut self_: Context = (*self.0).clone();
if let Some(new_pixels_per_point) = self_.memory.lock().new_pixels_per_point.take() {
self_.input.pixels_per_point = new_pixels_per_point;
}
self_.input.begin_frame(&new_raw_input);
self_.update_fonts(self_.input.pixels_per_point());
*self = Self(Arc::new(self_));
self.mutate(|context| {
if let Some(new_pixels_per_point) = context.memory.lock().new_pixels_per_point.take() {
context.input.pixels_per_point = new_pixels_per_point;
}
context.input.begin_frame(&new_raw_input);
context.update_fonts(context.input.pixels_per_point());
});
// Ensure we register the background area so panels and background ui can catch clicks:
let screen_rect = self.input.screen_rect();
@ -131,16 +131,12 @@ impl CtxRef {
run_ui(self);
self.drain_paint_lists();
let mut self_: Context = (*self.0).clone();
self_.input.on_events(new_raw_input);
*self = Self(Arc::new(self_));
self.mutate(|context| context.input.on_events(new_raw_input));
self.frame_state.lock().begin_pass(&self.input);
run_ui(self);
} else {
let mut self_: Context = (*self.0).clone();
self_.input.on_events(new_raw_input);
*self = Self(Arc::new(self_));
self.mutate(|context| context.input.on_events(new_raw_input));
self.frame_state.lock().begin_pass(&self.input);
run_ui(self);
@ -149,6 +145,12 @@ impl CtxRef {
self.end_frame()
}
fn mutate(&mut self, mutate: impl FnOnce(&mut Context)) {
let mut self_: Context = (*self.0).clone();
mutate(&mut self_);
*self = Self(Arc::new(self_));
}
// ---------------------------------------------------------------------
/// If the given [`Id`] is not unique, an error will be printed at the given position.
@ -398,13 +400,13 @@ impl Clone for Context {
fonts: self.fonts.clone(),
memory: self.memory.clone(),
animation_manager: self.animation_manager.clone(),
context_menu_system: self.context_menu_system.clone(),
input: self.input.clone(),
frame_state: self.frame_state.clone(),
graphics: self.graphics.clone(),
output: self.output.clone(),
paint_stats: self.paint_stats.clone(),
repaint_requests: self.repaint_requests.load(SeqCst).into(),
context_menu_system: self.context_menu_system.clone(),
}
}
}