From b1022d01c1cdcf77b8357fbc1891732b5dab7b88 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Fri, 1 Jan 2021 20:22:18 +0100 Subject: [PATCH] Rename epi::App::ui to epi::App::update --- egui_demo_lib/src/apps/demo/app.rs | 2 +- egui_demo_lib/src/apps/http_app.rs | 2 +- egui_demo_lib/src/wrap_app.rs | 6 +++--- egui_glium/src/backend.rs | 2 +- egui_web/src/backend.rs | 2 +- epi/src/lib.rs | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/egui_demo_lib/src/apps/demo/app.rs b/egui_demo_lib/src/apps/demo/app.rs index b20af585..ec03cdb2 100644 --- a/egui_demo_lib/src/apps/demo/app.rs +++ b/egui_demo_lib/src/apps/demo/app.rs @@ -293,7 +293,7 @@ impl epi::App for DemoApp { epi::set_value(storage, epi::APP_KEY, self); } - fn ui(&mut self, ctx: &CtxRef, frame: &mut epi::Frame<'_>) { + fn update(&mut self, ctx: &CtxRef, frame: &mut epi::Frame<'_>) { self.frame_history .on_new_frame(ctx.input().time, frame.info().cpu_usage); diff --git a/egui_demo_lib/src/apps/http_app.rs b/egui_demo_lib/src/apps/http_app.rs index 547c16c7..3a67afa6 100644 --- a/egui_demo_lib/src/apps/http_app.rs +++ b/egui_demo_lib/src/apps/http_app.rs @@ -62,7 +62,7 @@ impl epi::App for HttpApp { /// Called each time the UI needs repainting, which may be many times per second. /// Put your widgets into a `SidePanel`, `TopPanel`, `CentralPanel`, `Window` or `Area`. - fn ui(&mut self, ctx: &egui::CtxRef, frame: &mut epi::Frame<'_>) { + fn update(&mut self, ctx: &egui::CtxRef, frame: &mut epi::Frame<'_>) { if let Some(receiver) = &mut self.in_progress { // Are we there yet? if let Ok(result) = receiver.try_recv() { diff --git a/egui_demo_lib/src/wrap_app.rs b/egui_demo_lib/src/wrap_app.rs index 902bf342..b3e7fb13 100644 --- a/egui_demo_lib/src/wrap_app.rs +++ b/egui_demo_lib/src/wrap_app.rs @@ -21,7 +21,7 @@ impl epi::App for WrapApp { epi::set_value(storage, epi::APP_KEY, self); } - fn ui(&mut self, ctx: &egui::CtxRef, frame: &mut epi::Frame<'_>) { + fn update(&mut self, ctx: &egui::CtxRef, frame: &mut epi::Frame<'_>) { let web_location_hash = frame .info() .web_info @@ -57,9 +57,9 @@ impl epi::App for WrapApp { }); if self.selectable_demo_name == self.demo.name() { - self.demo.ui(ctx, frame); + self.demo.update(ctx, frame); } else if self.selectable_demo_name == self.http.name() { - self.http.ui(ctx, frame); + self.http.update(ctx, frame); } else { self.selectable_demo_name = self.demo.name().to_owned(); } diff --git a/egui_glium/src/backend.rs b/egui_glium/src/backend.rs index 0dac7c98..a6bd2dd1 100644 --- a/egui_glium/src/backend.rs +++ b/egui_glium/src/backend.rs @@ -150,7 +150,7 @@ pub fn run(mut app: Box) -> ! { repaint_signal: repaint_signal.clone(), } .build(); - app.ui(&ctx, &mut frame); + app.update(&ctx, &mut frame); let (egui_output, paint_commands) = ctx.end_frame(); let paint_jobs = ctx.tessellate(paint_commands); diff --git a/egui_web/src/backend.rs b/egui_web/src/backend.rs index c3e5e86e..e2b67bf3 100644 --- a/egui_web/src/backend.rs +++ b/egui_web/src/backend.rs @@ -203,7 +203,7 @@ impl AppRunner { .build(); let egui_ctx = &self.web_backend.ctx; - self.app.ui(egui_ctx, &mut frame); + self.app.update(egui_ctx, &mut frame); let (egui_output, paint_jobs) = self.web_backend.end_frame()?; handle_output(&egui_output); diff --git a/epi/src/lib.rs b/epi/src/lib.rs index 0bf22100..ceed3eed 100644 --- a/epi/src/lib.rs +++ b/epi/src/lib.rs @@ -60,7 +60,7 @@ pub use egui; // Re-export for user convenience pub trait App { /// Called each time the UI needs repainting, which may be many times per second. /// Put your widgets into a [`egui::SidePanel`], [`egui::TopPanel`], [`egui::CentralPanel`], [`egui::Window`] or [`egui::Area`]. - fn ui(&mut self, ctx: &egui::CtxRef, frame: &mut Frame<'_>); + fn update(&mut self, ctx: &egui::CtxRef, frame: &mut Frame<'_>); /// Called once before the first frame. /// Allows you to do setup code and to call `ctx.set_fonts()`.