Simplify arguments to process_viewport_commands

konkitoman · Nov 12, 2023 · e1f261b · e1f261b
1 parent 6e17040
commit e1f261b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/crates/eframe/src/native/run.rs b/crates/eframe/src/native/run.rs
@@ -1289,7 +1289,12 @@ mod glow_integration {
                             viewport.window = None;
                             viewport.gl_surface = None;
                         } else if let Some(window) = &viewport.window {
-                            process_viewport_commands(commands, *id, None, &window.borrow());
+                            let is_viewport_focused = false; // TODO
+                            process_viewport_commands(
+                                commands,
+                                &window.borrow(),
+                                is_viewport_focused,
+                            );
                         }
                         active_viewports_ids.insert(*id);
                         false
@@ -1616,11 +1621,11 @@ mod glow_integration {
             for (viewport_id, command) in viewport_commands {
                 if let Some(viewport) = glutin.borrow().viewports.get(&viewport_id) {
                     if let Some(window) = &viewport.borrow().window {
+                        let is_viewport_focused = self.focused_viewport == Some(viewport_id);
                         egui_winit::process_viewport_commands(
                             vec![command],
-                            viewport_id,
-                            self.focused_viewport,
                             &window.borrow(),
+                            is_viewport_focused,
                         );
                     }
                 }
@@ -2541,7 +2546,8 @@ mod wgpu_integration {
                         ..
                     }) = viewports.get(&id_pair.this)
                     {
-                        process_viewport_commands(commands, id_pair.this, None, &window.borrow());
+                        let is_viewport_focused = false; // TODO
+                        process_viewport_commands(commands, &window.borrow(), is_viewport_focused);
                     }
                 } else {
                     viewports.insert(
@@ -2561,11 +2567,11 @@ mod wgpu_integration {
 
             for (viewport_id, command) in viewport_commands {
                 if let Some(window) = viewports.get(&viewport_id).and_then(|w| w.window.clone()) {
+                    let is_viewport_focused = self.focused_viewport == Some(viewport_id);
                     egui_winit::process_viewport_commands(
                         vec![command],
-                        viewport_id,
-                        self.focused_viewport,
                         &window.borrow(),
+                        is_viewport_focused,
                     );
                 }
             }

diff --git a/crates/egui-winit/src/lib.rs b/crates/egui-winit/src/lib.rs
@@ -990,21 +990,18 @@ fn translate_cursor(cursor_icon: egui::CursorIcon) -> Option<winit::window::Curs
 
 pub fn process_viewport_commands(
     commands: Vec<ViewportCommand>,
-    viewport_id: ViewportId,
-    focused: Option<ViewportId>,
     window: &winit::window::Window,
+    is_viewport_focused: bool,
 ) {
     use winit::window::ResizeDirection;
 
     for command in commands {
         match command {
             egui::ViewportCommand::Drag => {
                 // if this is not checked on x11 the input will be permanently taken until the app is killed!
-                if let Some(focus) = focused {
-                    if focus == viewport_id {
-                        // TODO possible return the error to `egui::Context`
-                        let _ = window.drag_window();
-                    }
+                if is_viewport_focused {
+                    // TODO possible return the error to `egui::Context`
+                    let _ = window.drag_window();
                 }
             }
             egui::ViewportCommand::InnerSize(size) => {