mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-11 21:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Don't trigger hover popover action when mouse is over context menu

Browse source
This commit is contained in:
Keith Simmons 2022-06-21 11:23:25 -07:00
parent a5ae8d9072
commit 057a7ec989
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
crates/editor/src/element.rs
View file

@ -511,6 +511,8 @@ impl EditorElement {
cx,
);
paint.context_menu_bounds = Some(RectF::new(list_origin, context_menu.size()));
cx.scene.pop_stacking_context();
}
@ -1342,6 +1344,7 @@ impl Element for EditorElement {
bounds,
gutter_bounds,
text_bounds,
context_menu_bounds: None,
hover_bounds: None,
};
@ -1424,6 +1427,16 @@ impl Element for EditorElement {
} => self.scroll(*position, *delta, *precise, layout, paint, cx),
Event::KeyDown { input, .. } => self.key_down(input.as_deref(), cx),
Event::MouseMoved { position, .. } => {
// Don't trigger hover popover if mouse is hovering over context menu
if paint
.context_menu_bounds
.map_or(false, |context_menu_bounds| {
context_menu_bounds.contains_point(*position)
})
{
return false;
}
if paint
.hover_bounds
.map_or(false, |hover_bounds| hover_bounds.contains_point(*position))
@ -1528,6 +1541,7 @@ pub struct PaintState {
bounds: RectF,
gutter_bounds: RectF,
text_bounds: RectF,
context_menu_bounds: Option<RectF>,
hover_bounds: Option<RectF>,
}