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

Don't dispatch events down the tree if they were handled by mouse region

Browse source
This commit is contained in:
Antonio Scandurra 2022-05-27 11:20:32 +02:00
parent 1d7fc12229
commit 7c7917494c
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/gpui/src/presenter.rs
View file

@ -320,8 +320,10 @@ impl Presenter {
} }
let mut event_cx = self.build_event_context(cx); let mut event_cx = self.build_event_context(cx);
let mut handled = false;
for unhovered_region in unhovered_regions { for unhovered_region in unhovered_regions {
if let Some(hover_callback) = unhovered_region.hover { if let Some(hover_callback) = unhovered_region.hover {
handled = true;
event_cx.with_current_view(unhovered_region.view_id, |event_cx| { event_cx.with_current_view(unhovered_region.view_id, |event_cx| {
hover_callback(false, event_cx); hover_callback(false, event_cx);
}) })
@ -330,6 +332,7 @@ impl Presenter {
for hovered_region in hovered_regions { for hovered_region in hovered_regions {
if let Some(hover_callback) = hovered_region.hover { if let Some(hover_callback) = hovered_region.hover {
handled = true;
event_cx.with_current_view(hovered_region.view_id, |event_cx| { event_cx.with_current_view(hovered_region.view_id, |event_cx| {
hover_callback(true, event_cx); hover_callback(true, event_cx);
}) })
@ -338,6 +341,7 @@ impl Presenter {
if let Some((clicked_region, position, click_count)) = clicked_region { if let Some((clicked_region, position, click_count)) = clicked_region {
if let Some(click_callback) = clicked_region.click { if let Some(click_callback) = clicked_region.click {
handled = true;
event_cx.with_current_view(clicked_region.view_id, |event_cx| { event_cx.with_current_view(clicked_region.view_id, |event_cx| {
click_callback(position, click_count, event_cx); click_callback(position, click_count, event_cx);
}) })
@ -346,6 +350,7 @@ impl Presenter {
if let Some((right_clicked_region, position, click_count)) = right_clicked_region { if let Some((right_clicked_region, position, click_count)) = right_clicked_region {
if let Some(right_click_callback) = right_clicked_region.right_click { if let Some(right_click_callback) = right_clicked_region.right_click {
handled = true;
event_cx.with_current_view(right_clicked_region.view_id, |event_cx| { event_cx.with_current_view(right_clicked_region.view_id, |event_cx| {
right_click_callback(position, click_count, event_cx); right_click_callback(position, click_count, event_cx);
}) })
@ -354,13 +359,16 @@ impl Presenter {
if let Some((dragged_region, delta)) = dragged_region { if let Some((dragged_region, delta)) = dragged_region {
if let Some(drag_callback) = dragged_region.drag { if let Some(drag_callback) = dragged_region.drag {
handled = true;
event_cx.with_current_view(dragged_region.view_id, |event_cx| { event_cx.with_current_view(dragged_region.view_id, |event_cx| {
drag_callback(delta, event_cx); drag_callback(delta, event_cx);
}) })
} }
} }
if !handled {
event_cx.dispatch_event(root_view_id, &event); event_cx.dispatch_event(root_view_id, &event);
}
invalidated_views.extend(event_cx.invalidated_views); invalidated_views.extend(event_cx.invalidated_views);
let dispatch_directives = event_cx.dispatched_actions; let dispatch_directives = event_cx.dispatched_actions;