Merge branch 'fix-focus-webview-when-click' into 'main'

fix: force update focused webview_id when mouse click on a webview

See merge request verso-browser/verso!336

Author: dklassic

src/compositor.rs

@@ -1328,12 +1328,22 @@ impl IOCompositor {
             self.constellation_chan
                 .send(EmbedderToConstellationMessage::ForwardInputEvent(
                     webview_id,
-                    event,
+                    event.clone(),
                     Some(result),
                 ))
         {
             warn!("Sending event to constellation failed ({error:?}).");
         }
+
+        // If the event is a mouse button, send FocusWebView event to the constellation.
+        // the webview will update current focused webview_id in the EmbedderMsg::WebViewFocused event.
+        if let InputEvent::MouseButton(event) = &event {
+            if event.action == MouseButtonAction::Click {
+                let _ = self
+                    .constellation_chan
+                    .send(EmbedderToConstellationMessage::FocusWebView(webview_id));
+            }
+        }
     }
 
     /// Handle the input event in the window.
@@ -1370,6 +1380,15 @@ impl IOCompositor {
         self.dispatch_input_event(webview_id, event);
     }
 
+    /// Get the webview id from a point.
+    pub(crate) fn webview_id_from_point(&self, point: DevicePoint) -> Option<WebViewId> {
+        self.hit_test_at_point(point)
+            .map(|result| result.pipeline_id)
+            .and_then(|pipeline_id| self.pipeline_details.get(&pipeline_id))
+            .and_then(|details| details.pipeline.clone())
+            .map(|pipeline| pipeline.webview_id)
+    }
+
     fn hit_test_at_point(&self, point: DevicePoint) -> Option<CompositorHitTestResult> {
         self.hit_test_at_point_with_flags_and_pipeline(point, HitTestFlags::empty(), None)
             .first()

src/window.rs

@@ -519,16 +519,14 @@ impl Window {
                     }
                 };
 
-                let webview_id = match self.focused_webview_id {
-                    Some(webview_id) => webview_id,
-                    None => {
-                        log::trace!("No focused webview, skipping MouseInput event.");
-                        return;
-                    }
+                let Some(webview_id) = &compositor.webview_id_from_point(point) else {
+                    log::trace!("No webview at point, skipping MouseInput event.");
+                    return;
                 };
+
                 forward_input_event(
                     compositor,
-                    webview_id,
+                    *webview_id,
                     sender,
                     InputEvent::MouseButton(event),
                 );
@@ -542,7 +540,7 @@ impl Window {
                     };
                     forward_input_event(
                         compositor,
-                        webview_id,
+                        *webview_id,
                         sender,
                         InputEvent::MouseButton(event),
                     );