From ee2f2a7986ee85cd3036bc55bddd4a40da5dd03c Mon Sep 17 00:00:00 2001 From: Konkitoman Date: Sun, 6 Aug 2023 10:31:48 +0300 Subject: [PATCH] Fix web demo --- crates/eframe/src/web/app_runner.rs | 6 ++++-- crates/egui_demo_app/src/apps/http_app.rs | 8 +++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/crates/eframe/src/web/app_runner.rs b/crates/eframe/src/web/app_runner.rs index 4da93c521..7359bae4a 100644 --- a/crates/eframe/src/web/app_runner.rs +++ b/crates/eframe/src/web/app_runner.rs @@ -178,14 +178,15 @@ impl AppRunner { let canvas_size = super::canvas_size_in_points(self.canvas_id()); let raw_input = self.input.new_frame(canvas_size); - let full_output = self.egui_ctx.run(raw_input, |egui_ctx| { - self.app.update(egui_ctx, &mut self.frame); + let full_output = self.egui_ctx.run(raw_input, 0, 0, |egui_ctx| { + self.app.update(egui_ctx, &mut self.frame, None); }); let egui::FullOutput { platform_output, repaint_after, textures_delta, shapes, + .. } = full_output; self.handle_platform_output(platform_output); @@ -199,6 +200,7 @@ impl AppRunner { self.frame.info.cpu_usage = Some((now_sec() - frame_start) as f32); + let (_, repaint_after) = repaint_after[0]; (repaint_after, clipped_primitives) } diff --git a/crates/egui_demo_app/src/apps/http_app.rs b/crates/egui_demo_app/src/apps/http_app.rs index 4d87a3e29..cfa719e68 100644 --- a/crates/egui_demo_app/src/apps/http_app.rs +++ b/crates/egui_demo_app/src/apps/http_app.rs @@ -1,3 +1,4 @@ +use egui::ViewportRender; use egui_extras::RetainedImage; use poll_promise::Promise; @@ -54,7 +55,12 @@ impl Default for HttpApp { } impl eframe::App for HttpApp { - fn update(&mut self, ctx: &egui::Context, frame: &mut eframe::Frame) { + fn update( + &mut self, + ctx: &egui::Context, + frame: &mut eframe::Frame, + _: Option<&ViewportRender>, + ) { egui::TopBottomPanel::bottom("http_bottom").show(ctx, |ui| { let layout = egui::Layout::top_down(egui::Align::Center).with_main_justify(true); ui.allocate_ui_with_layout(ui.available_size(), layout, |ui| {