Move more code into fj-viewer

hannobraun · Nov 18, 2024 · d1854de · d1854de
1 parent 0ad2699
commit d1854de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/crates/fj-viewer/src/viewer.rs b/crates/fj-viewer/src/viewer.rs
@@ -121,13 +121,16 @@ impl Viewer {
     /// # Handle a mouse button being pressed
     pub fn on_mouse_button_pressed(&mut self, button: MouseButton) {
         self.most_recent_mouse_button = Some(button);
+        self.add_focus_point();
     }
 
     /// # Handle a mouse button being pressed
     pub fn on_mouse_button_released(&mut self, button: MouseButton) {
         if self.most_recent_mouse_button == Some(button) {
             self.most_recent_mouse_button = None;
         }
+
+        self.remove_focus_point();
     }
 
     /// Handle the screen being resized

diff --git a/crates/fj-window/src/display.rs b/crates/fj-window/src/display.rs
@@ -121,15 +121,6 @@ impl ApplicationHandler for DisplayState {
                 viewer.on_cursor_movement([position.x, position.y]);
             }
             WindowEvent::MouseInput { state, button, .. } => {
-                match state {
-                    ElementState::Pressed => {
-                        viewer.add_focus_point();
-                    }
-                    ElementState::Released => {
-                        viewer.remove_focus_point();
-                    }
-                }
-
                 let button = match button {
                     MouseButton::Left => Some(fj_viewer::MouseButton::Left),
                     MouseButton::Right => Some(fj_viewer::MouseButton::Right),