mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-08 19:43:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Prevent content mask breaks from having the same z-index

Browse source 
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
This commit is contained in:
Julia 2024-01-16 11:23:28 -05:00
parent 4f25df6ce2
commit 60b79ef2ea
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -315,6 +315,7 @@ pub(crate) struct Frame {
pub(crate) depth_map: Vec<(StackingOrder, EntityId, Bounds<Pixels>)>, pub(crate) depth_map: Vec<(StackingOrder, EntityId, Bounds<Pixels>)>,
pub(crate) z_index_stack: StackingOrder, pub(crate) z_index_stack: StackingOrder,
pub(crate) next_stacking_order_id: u32, pub(crate) next_stacking_order_id: u32,
next_root_z_index: u8,
content_mask_stack: Vec<ContentMask<Pixels>>, content_mask_stack: Vec<ContentMask<Pixels>>,
element_offset_stack: Vec<Point<Pixels>>, element_offset_stack: Vec<Point<Pixels>>,
requested_input_handler: Option<RequestedInputHandler>, requested_input_handler: Option<RequestedInputHandler>,
@ -337,6 +338,7 @@ impl Frame {
depth_map: Vec::new(), depth_map: Vec::new(),
z_index_stack: StackingOrder::default(), z_index_stack: StackingOrder::default(),
next_stacking_order_id: 0, next_stacking_order_id: 0,
next_root_z_index: 0,
content_mask_stack: Vec::new(), content_mask_stack: Vec::new(),
element_offset_stack: Vec::new(), element_offset_stack: Vec::new(),
requested_input_handler: None, requested_input_handler: None,
@ -354,6 +356,7 @@ impl Frame {
self.dispatch_tree.clear(); self.dispatch_tree.clear();
self.depth_map.clear(); self.depth_map.clear();
self.next_stacking_order_id = 0; self.next_stacking_order_id = 0;
self.next_root_z_index = 0;
self.reused_views.clear(); self.reused_views.clear();
self.scene.clear(); self.scene.clear();
self.requested_input_handler.take(); self.requested_input_handler.take();
@ -2450,8 +2453,13 @@ pub trait BorrowWindow: BorrowMut<Window> + BorrowMut<AppContext> {
}; };
let new_stacking_order_id = let new_stacking_order_id =
post_inc(&mut self.window_mut().next_frame.next_stacking_order_id); post_inc(&mut self.window_mut().next_frame.next_stacking_order_id);
let new_root_z_index = post_inc(&mut self.window_mut().next_frame.next_root_z_index);
let old_stacking_order = mem::take(&mut self.window_mut().next_frame.z_index_stack); let old_stacking_order = mem::take(&mut self.window_mut().next_frame.z_index_stack);
self.window_mut().next_frame.z_index_stack.id = new_stacking_order_id; self.window_mut().next_frame.z_index_stack.id = new_stacking_order_id;
self.window_mut()
.next_frame
.z_index_stack
.push(new_root_z_index);
self.window_mut().next_frame.content_mask_stack.push(mask); self.window_mut().next_frame.content_mask_stack.push(mask);
let result = f(self); let result = f(self);
self.window_mut().next_frame.content_mask_stack.pop(); self.window_mut().next_frame.content_mask_stack.pop();