Refactor WinitApp slightly

emilk · Sep 13, 2024 · 4c035a3 · 4c035a3
1 parent f8ffa5c
commit 4c035a3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/crates/eframe/src/native/glow_integration.rs b/crates/eframe/src/native/glow_integration.rs
@@ -346,10 +346,8 @@ impl<'app> GlowWinitApp<'app> {
 }
 
 impl<'app> WinitApp for GlowWinitApp<'app> {
-    fn cumulative_pass_nr(&self, viewport_id: ViewportId) -> u64 {
-        self.running.as_ref().map_or(0, |r| {
-            r.integration.egui_ctx.cumulative_pass_nr_for(viewport_id)
-        })
+    fn egui_ctx(&self) -> Option<&egui::Context> {
+        self.running.as_ref().map(|r| &r.integration.egui_ctx)
     }
 
     fn window(&self, window_id: WindowId) -> Option<Arc<Window>> {

diff --git a/crates/eframe/src/native/run.rs b/crates/eframe/src/native/run.rs
@@ -231,7 +231,10 @@ impl<T: WinitApp> ApplicationHandler<UserEvent> for WinitAppWrapper<T> {
                     cumulative_pass_nr,
                     viewport_id,
                 } => {
-                    let current_pass_nr = self.winit_app.cumulative_pass_nr(viewport_id);
+                    let current_pass_nr = self
+                        .winit_app
+                        .egui_ctx()
+                        .map_or(0, |ctx| ctx.cumulative_pass_nr_for(viewport_id));
                     if current_pass_nr == cumulative_pass_nr
                         || current_pass_nr == cumulative_pass_nr + 1
                     {

diff --git a/crates/eframe/src/native/wgpu_integration.rs b/crates/eframe/src/native/wgpu_integration.rs
@@ -324,10 +324,8 @@ impl<'app> WgpuWinitApp<'app> {
 }
 
 impl<'app> WinitApp for WgpuWinitApp<'app> {
-    fn cumulative_pass_nr(&self, viewport_id: ViewportId) -> u64 {
-        self.running.as_ref().map_or(0, |r| {
-            r.integration.egui_ctx.cumulative_pass_nr_for(viewport_id)
-        })
+    fn egui_ctx(&self) -> Option<&egui::Context> {
+        self.running.as_ref().map(|r| &r.integration.egui_ctx)
     }
 
     fn window(&self, window_id: WindowId) -> Option<Arc<Window>> {

diff --git a/crates/eframe/src/native/winit_integration.rs b/crates/eframe/src/native/winit_integration.rs
@@ -64,8 +64,7 @@ impl From<accesskit_winit::Event> for UserEvent {
 }
 
 pub trait WinitApp {
-    /// The current frame number, as reported by egui.
-    fn cumulative_pass_nr(&self, viewport_id: ViewportId) -> u64;
+    fn egui_ctx(&self) -> Option<&egui::Context>;
 
     fn window(&self, window_id: WindowId) -> Option<Arc<Window>>;