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

Restrict multiple hovered regions to a single stacking context

Browse source 
We won't hover regions from stacking contexts that are below the one being hovered.
This commit is contained in:
Nathan Sobo 2022-05-27 11:09:07 -06:00
parent 9099c40364
commit 5413a97c7e
3 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,7 @@ pub struct Presenter {
pub(crate) rendered_views: HashMap<usize, ElementBox>, pub(crate) rendered_views: HashMap<usize, ElementBox>,
parents: HashMap<usize, usize>, parents: HashMap<usize, usize>,
cursor_regions: Vec<CursorRegion>, cursor_regions: Vec<CursorRegion>,
mouse_regions: Vec<MouseRegion>, mouse_regions: Vec<(MouseRegion, usize)>,
font_cache: Arc<FontCache>, font_cache: Arc<FontCache>,
text_layout_cache: TextLayoutCache, text_layout_cache: TextLayoutCache,
asset_cache: Arc<AssetCache>, asset_cache: Arc<AssetCache>,
@ -230,7 +230,7 @@ impl Presenter {
match event { match event {
Event::LeftMouseDown { position, .. } => { Event::LeftMouseDown { position, .. } => {
for region in self.mouse_regions.iter().rev() { for (region, _) in self.mouse_regions.iter().rev() {
if region.bounds.contains_point(position) { if region.bounds.contains_point(position) {
invalidated_views.push(region.view_id); invalidated_views.push(region.view_id);
mouse_down_region = Some((region.clone(), position)); mouse_down_region = Some((region.clone(), position));
@ -254,7 +254,7 @@ impl Presenter {
} }
} }
Event::RightMouseDown { position, .. } => { Event::RightMouseDown { position, .. } => {
for region in self.mouse_regions.iter().rev() { for (region, _) in self.mouse_regions.iter().rev() {
if region.bounds.contains_point(position) { if region.bounds.contains_point(position) {
invalidated_views.push(region.view_id); invalidated_views.push(region.view_id);
right_mouse_down_region = Some((region.clone(), position)); right_mouse_down_region = Some((region.clone(), position));
@ -291,9 +291,13 @@ impl Presenter {
} }
cx.platform().set_cursor_style(style_to_assign); cx.platform().set_cursor_style(style_to_assign);
for region in self.mouse_regions.iter().rev() { let mut hover_depth = None;
for (region, depth) in self.mouse_regions.iter().rev() {
let region_id = region.id(); let region_id = region.id();
if region.bounds.contains_point(position) { if region.bounds.contains_point(position)
&& hover_depth.map_or(true, |hover_depth| hover_depth == *depth)
{
hover_depth = Some(*depth);
if !self.hovered_region_ids.contains(&region_id) { if !self.hovered_region_ids.contains(&region_id) {
invalidated_views.push(region.view_id); invalidated_views.push(region.view_id);
hovered_regions.push(region.clone()); hovered_regions.push(region.clone());

15
crates/gpui/src/scene.rs
View file

@ -210,11 +210,16 @@ impl Scene {
.collect() .collect()
} }
pub fn mouse_regions(&self) -> Vec<MouseRegion> { pub fn mouse_regions(&self) -> Vec<(MouseRegion, usize)> {
self.layers() let mut regions = Vec::new();
.flat_map(|layer| &layer.mouse_regions) for (stacking_depth, stacking_context) in self.stacking_contexts.iter().enumerate() {
.cloned() for layer in &stacking_context.layers {
.collect() for mouse_region in &layer.mouse_regions {
regions.push((mouse_region.clone(), stacking_depth));
}
}
}
regions
} }
pub fn push_stacking_context(&mut self, clip_bounds: Option<RectF>) { pub fn push_stacking_context(&mut self, clip_bounds: Option<RectF>) {

4
crates/project_panel/src/project_panel.rs
View file

@ -12,7 +12,7 @@ use gpui::{
impl_internal_actions, keymap, impl_internal_actions, keymap,
platform::CursorStyle, platform::CursorStyle,
AppContext, ClipboardItem, Element, ElementBox, Entity, ModelHandle, MutableAppContext, AppContext, ClipboardItem, Element, ElementBox, Entity, ModelHandle, MutableAppContext,
PromptLevel, RenderContext, Task, View, ViewContext, ViewHandle, WeakViewHandle, PromptLevel, RenderContext, Task, View, ViewContext, ViewHandle,
}; };
use menu::{Confirm, SelectNext, SelectPrev}; use menu::{Confirm, SelectNext, SelectPrev};
use project::{Entry, EntryKind, Project, ProjectEntryId, ProjectPath, Worktree, WorktreeId}; use project::{Entry, EntryKind, Project, ProjectEntryId, ProjectPath, Worktree, WorktreeId};
@ -38,7 +38,6 @@ pub struct ProjectPanel {
edit_state: Option<EditState>, edit_state: Option<EditState>,
filename_editor: ViewHandle<Editor>, filename_editor: ViewHandle<Editor>,
context_menu: ViewHandle<ContextMenu>, context_menu: ViewHandle<ContextMenu>,
handle: WeakViewHandle<Self>,
} }
#[derive(Copy, Clone)] #[derive(Copy, Clone)]
@ -174,7 +173,6 @@ impl ProjectPanel {
edit_state: None, edit_state: None,
filename_editor, filename_editor,
context_menu: cx.add_view(|_| ContextMenu::new()), context_menu: cx.add_view(|_| ContextMenu::new()),
handle: cx.weak_handle(),
}; };
this.update_visible_entries(None, cx); this.update_visible_entries(None, cx);
this this