Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Automatically transfer focus on mouse down in Interactivity::paint

Browse source
This commit is contained in:
Antonio Scandurra 2023-12-13 09:57:02 +01:00
parent e53b9f5ccf
commit 5018072203
2 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/gpui2/src/elements/div.rs
View file

@ -755,6 +755,26 @@ impl Interactivity {
}
}
// If this element can be focused, register a mouse down listener
// that will automatically transfer focus when hitting the element.
// This behavior can be suppressed by using `cx.prevent_default()`.
if let Some(focus_handle) = element_state.focus_handle.clone() {
cx.on_mouse_event({
let interactive_bounds = interactive_bounds.clone();
move |event: &MouseDownEvent, phase, cx| {
if phase == DispatchPhase::Bubble
&& !cx.default_prevented()
&& interactive_bounds.visibly_contains(&event.position, cx)
{
cx.focus(&focus_handle);
// If there is a parent that is also focusable, prevent it
// from trasferring focus because we already did so.
cx.prevent_default();
}
}
});
}
for listener in self.mouse_down_listeners.drain(..) {
let interactive_bounds = interactive_bounds.clone();
cx.on_mouse_event(move |event: &MouseDownEvent, phase, cx| {

3
crates/gpui2/src/window.rs
View file

@ -1332,8 +1332,9 @@ impl<'a> WindowContext<'a> {
/// Dispatch a mouse or keyboard event on the window.
pub fn dispatch_event(&mut self, event: InputEvent) -> bool {
// Handlers may set this to false by calling `stop_propagation`
// Handlers may set this to false by calling `stop_propagation`.
self.app.propagate_event = true;
// Handlers may set this to true by calling `prevent_default`.
self.window.default_prevented = false;
let event = match event {