Simplify

crates/egui_demo_app/src/apps/custom3d_glow.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use eframe::egui_glow;
-use egui::{mutex::Mutex, ViewportRender};
+use egui::mutex::Mutex;
 use egui_glow::glow;
 
 pub struct Custom3d {
@@ -21,16 +21,7 @@ impl Custom3d {
 }
 
 impl eframe::App for Custom3d {
-    fn update(
-        &mut self,
-        ctx: &egui::Context,
-        _frame: &mut eframe::Frame,
-        render: Option<&ViewportRender>,
-    ) {
-        if let Some(render) = render {
-            render(ctx);
-            return;
-        }
+    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
         egui::CentralPanel::default().show(ctx, |ui| {
             egui::ScrollArea::both()
                 .auto_shrink([false; 2])

crates/egui_demo_app/src/apps/custom3d_wgpu.rs

@@ -4,7 +4,6 @@ use eframe::{
     egui_wgpu::wgpu::util::DeviceExt,
     egui_wgpu::{self, wgpu},
 };
-use egui::ViewportRender;
 
 pub struct Custom3d {
     angle: f32,
@@ -97,16 +96,7 @@ impl Custom3d {
 }
 
 impl eframe::App for Custom3d {
-    fn update(
-        &mut self,
-        ctx: &egui::Context,
-        _frame: &mut eframe::Frame,
-        render: Option<&ViewportRender>,
-    ) {
-        if let Some(render) = render {
-            render(ctx);
-            return;
-        }
+    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
         egui::CentralPanel::default().show(ctx, |ui| {
             egui::ScrollArea::both()
                 .auto_shrink([false; 2])

crates/egui_demo_app/src/apps/http_app.rs

@@ -1,4 +1,3 @@
-use egui::ViewportRender;
 use egui_extras::RetainedImage;
 use poll_promise::Promise;
 
@@ -55,12 +54,7 @@ impl Default for HttpApp {
 }
 
 impl eframe::App for HttpApp {
-    fn update(
-        &mut self,
-        ctx: &egui::Context,
-        frame: &mut eframe::Frame,
-        _: Option<&ViewportRender>,
-    ) {
+    fn update(&mut self, ctx: &egui::Context, frame: &mut eframe::Frame) {
         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| {

crates/egui_demo_app/src/wrap_app.rs

@@ -1,4 +1,3 @@
-use egui::ViewportRender;
 use egui_demo_lib::is_mobile;
 
 #[cfg(feature = "glow")]
@@ -14,16 +13,7 @@ struct EasyMarkApp {
 }
 
 impl eframe::App for EasyMarkApp {
-    fn update(
-        &mut self,
-        ctx: &egui::Context,
-        _frame: &mut eframe::Frame,
-        render: Option<&ViewportRender>,
-    ) {
-        if let Some(render) = render {
-            render(ctx);
-            return;
-        }
+    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
         self.editor.panels(ctx);
     }
 }
@@ -37,16 +27,7 @@ pub struct DemoApp {
 }
 
 impl eframe::App for DemoApp {
-    fn update(
-        &mut self,
-        ctx: &egui::Context,
-        _frame: &mut eframe::Frame,
-        render: Option<&ViewportRender>,
-    ) {
-        if let Some(render) = render {
-            render(ctx);
-            return;
-        }
+    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
         self.demo_windows.ui(ctx);
     }
 }
@@ -60,16 +41,7 @@ pub struct FractalClockApp {
 }
 
 impl eframe::App for FractalClockApp {
-    fn update(
-        &mut self,
-        ctx: &egui::Context,
-        _frame: &mut eframe::Frame,
-        render: Option<&ViewportRender>,
-    ) {
-        if let Some(render) = render {
-            render(ctx);
-            return;
-        }
+    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
         egui::CentralPanel::default()
             .frame(egui::Frame::dark_canvas(&ctx.style()))
             .show(ctx, |ui| {
@@ -88,16 +60,7 @@ pub struct ColorTestApp {
 }
 
 impl eframe::App for ColorTestApp {
-    fn update(
-        &mut self,
-        ctx: &egui::Context,
-        frame: &mut eframe::Frame,
-        render: Option<&ViewportRender>,
-    ) {
-        if let Some(render) = render {
-            render(ctx);
-            return;
-        }
+    fn update(&mut self, ctx: &egui::Context, frame: &mut eframe::Frame) {
         egui::CentralPanel::default().show(ctx, |ui| {
             if frame.is_web() {
                 ui.label(
@@ -272,16 +235,7 @@ impl eframe::App for WrapApp {
         visuals.panel_fill.to_normalized_gamma_f32()
     }
 
-    fn update(
-        &mut self,
-        ctx: &egui::Context,
-        frame: &mut eframe::Frame,
-        render: Option<&ViewportRender>,
-    ) {
-        if let Some(render) = render {
-            render(ctx);
-            return;
-        }
+    fn update(&mut self, ctx: &egui::Context, frame: &mut eframe::Frame) {
         #[cfg(target_arch = "wasm32")]
         if let Some(anchor) = frame.info().web_info.location.hash.strip_prefix('#') {
             let anchor = Anchor::all().into_iter().find(|x| x.to_string() == anchor);
@@ -310,7 +264,7 @@ impl eframe::App for WrapApp {
             cmd = self.backend_panel(ctx, frame);
         }
 
-        self.show_selected_app(ctx, frame, render);
+        self.show_selected_app(ctx, frame);
 
         self.state.backend_panel.end_of_frame(ctx);
 
@@ -397,16 +351,11 @@ impl WrapApp {
         });
     }
 
-    fn show_selected_app(
-        &mut self,
-        ctx: &egui::Context,
-        frame: &mut eframe::Frame,
-        render: Option<&ViewportRender>,
-    ) {
+    fn show_selected_app(&mut self, ctx: &egui::Context, frame: &mut eframe::Frame) {
         let selected_anchor = self.state.selected_anchor;
         for (_name, anchor, app) in self.apps_iter_mut() {
             if anchor == selected_anchor || ctx.memory(|mem| mem.everything_is_visible()) {
-                app.update(ctx, frame, render);
+                app.update(ctx, frame);
             }
         }
     }