Update wgpu_integration.rs

rustbasic · Jun 16, 2024 · eb958e5 · eb958e5
1 parent e349038
commit eb958e5
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/crates/eframe/src/native/wgpu_integration.rs b/crates/eframe/src/native/wgpu_integration.rs
@@ -647,7 +647,7 @@ impl WgpuWinitRunning {
             viewports,
             painter,
             viewport_from_window,
-            focused_viewport,
+            ..
         } = &mut *shared_mut;
 
         let FullOutput {
@@ -675,8 +675,6 @@ impl WgpuWinitRunning {
             return EventResult::Wait;
         };
 
-        egui_winit.handle_platform_output(window, platform_output);
-
         let clipped_primitives = egui_ctx.tessellate(shapes, pixels_per_point);
 
         let screenshot_requested = viewport
@@ -728,13 +726,14 @@ impl WgpuWinitRunning {
 
         integration.post_rendering(window);
 
+        egui_winit.handle_platform_output(window, platform_output);
+
         handle_viewport_output(
             &integration.egui_ctx,
             &viewport_output,
             viewports,
             painter,
             viewport_from_window,
-            *focused_viewport,
         );
 
         let window = viewport_from_window
@@ -1001,7 +1000,6 @@ fn render_immediate_viewport(
         viewports,
         painter,
         viewport_from_window,
-        focused_viewport,
         ..
     } = &mut *shared_mut;
 
@@ -1041,7 +1039,6 @@ fn render_immediate_viewport(
         viewports,
         painter,
         viewport_from_window,
-        *focused_viewport,
     );
 }
 
@@ -1066,7 +1063,6 @@ fn handle_viewport_output(
     viewports: &mut ViewportIdMap<Viewport>,
     painter: &mut egui_wgpu::winit::Painter,
     viewport_from_window: &mut HashMap<WindowId, ViewportId>,
-    focused_viewport: Option<ViewportId>,
 ) {
     for (
         viewport_id,
@@ -1088,15 +1084,13 @@ fn handle_viewport_output(
         if let Some(window) = viewport.window.as_ref() {
             let old_inner_size = window.inner_size();
 
-            let is_viewport_focused = focused_viewport == Some(viewport_id);
             viewport.deferred_commands.append(&mut commands);
 
             egui_winit::process_viewport_commands(
                 egui_ctx,
                 &mut viewport.info,
                 std::mem::take(&mut viewport.deferred_commands),
                 window,
-                is_viewport_focused,
                 &mut viewport.actions_requested,
             );