Capture mouse events when rendering disconnected overlay

We do so by replacing `EventHandler::capture` with a new `::capture_all` method.
After switching to mouse regions as part of zed-industries/zed#1081, overriding
`dispatch_event` on `EventHandler` wasn't enough anymore because mouse interactions
take place on a privileged code path that runs *before* dispatching any event.

With this change, `EventHandler` will now push a mouse region that intercepts all
mouse interactions, as well as pushing a cursor region that resets the cursor style
to `Arrow`.

One interesting change as part of this is that we've removed the ability to see which
event we are capturing: we were not using this capability anyway and `capture_all` provides
a simpler interface, so I went with that. In the future, we can opt into capturing specific
events or mouse interactions if there's a code path that needs that.
This commit is contained in:
Antonio Scandurra 2022-06-04 10:41:08 +02:00
parent ff3e3d0799
commit 74aa9c1320
2 changed files with 33 additions and 17 deletions

View file

@ -1,14 +1,14 @@
use crate::{
geometry::vector::Vector2F, CursorRegion, DebugContext, Element, ElementBox, Event,
EventContext, LayoutContext, MouseRegion, NavigationDirection, PaintContext, SizeConstraint,
};
use pathfinder_geometry::rect::RectF; use pathfinder_geometry::rect::RectF;
use serde_json::json; use serde_json::json;
use std::{any::TypeId, rc::Rc};
use crate::{
geometry::vector::Vector2F, DebugContext, Element, ElementBox, Event, EventContext,
LayoutContext, NavigationDirection, PaintContext, SizeConstraint,
};
pub struct EventHandler { pub struct EventHandler {
child: ElementBox, child: ElementBox,
capture: Option<Box<dyn FnMut(&Event, RectF, &mut EventContext) -> bool>>, capture_all: Option<(TypeId, usize)>,
mouse_down: Option<Box<dyn FnMut(&mut EventContext) -> bool>>, mouse_down: Option<Box<dyn FnMut(&mut EventContext) -> bool>>,
right_mouse_down: Option<Box<dyn FnMut(&mut EventContext) -> bool>>, right_mouse_down: Option<Box<dyn FnMut(&mut EventContext) -> bool>>,
navigate_mouse_down: Option<Box<dyn FnMut(NavigationDirection, &mut EventContext) -> bool>>, navigate_mouse_down: Option<Box<dyn FnMut(NavigationDirection, &mut EventContext) -> bool>>,
@ -18,7 +18,7 @@ impl EventHandler {
pub fn new(child: ElementBox) -> Self { pub fn new(child: ElementBox) -> Self {
Self { Self {
child, child,
capture: None, capture_all: None,
mouse_down: None, mouse_down: None,
right_mouse_down: None, right_mouse_down: None,
navigate_mouse_down: None, navigate_mouse_down: None,
@ -49,11 +49,8 @@ impl EventHandler {
self self
} }
pub fn capture<F>(mut self, callback: F) -> Self pub fn capture_all<T: 'static>(mut self, id: usize) -> Self {
where self.capture_all = Some((TypeId::of::<T>(), id));
F: 'static + FnMut(&Event, RectF, &mut EventContext) -> bool,
{
self.capture = Some(Box::new(callback));
self self
} }
} }
@ -78,6 +75,27 @@ impl Element for EventHandler {
_: &mut Self::LayoutState, _: &mut Self::LayoutState,
cx: &mut PaintContext, cx: &mut PaintContext,
) -> Self::PaintState { ) -> Self::PaintState {
if let Some(discriminant) = self.capture_all {
cx.scene.push_stacking_context(None);
cx.scene.push_cursor_region(CursorRegion {
bounds,
style: Default::default(),
});
cx.scene.push_mouse_region(MouseRegion {
view_id: cx.current_view_id(),
discriminant: Some(discriminant),
bounds,
hover: Some(Rc::new(|_, _, _| {})),
mouse_down: Some(Rc::new(|_, _| {})),
click: Some(Rc::new(|_, _, _| {})),
right_mouse_down: Some(Rc::new(|_, _| {})),
right_click: Some(Rc::new(|_, _, _| {})),
drag: Some(Rc::new(|_, _| {})),
mouse_down_out: Some(Rc::new(|_, _| {})),
right_mouse_down_out: Some(Rc::new(|_, _| {})),
});
cx.scene.pop_stacking_context();
}
self.child.paint(bounds.origin(), visible_bounds, cx); self.child.paint(bounds.origin(), visible_bounds, cx);
} }
@ -90,11 +108,9 @@ impl Element for EventHandler {
_: &mut Self::PaintState, _: &mut Self::PaintState,
cx: &mut EventContext, cx: &mut EventContext,
) -> bool { ) -> bool {
if let Some(capture) = self.capture.as_mut() { if self.capture_all.is_some() {
if capture(event, visible_bounds, cx) {
return true; return true;
} }
}
if self.child.dispatch_event(event, cx) { if self.child.dispatch_event(event, cx) {
true true

View file

@ -1878,7 +1878,7 @@ impl Workspace {
.with_style(theme.workspace.disconnected_overlay.container) .with_style(theme.workspace.disconnected_overlay.container)
.boxed(), .boxed(),
) )
.capture(|_, _, _| true) .capture_all::<Self>(0)
.boxed(), .boxed(),
) )
} else { } else {