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

Prevent z-index id shuffle when number of z-indicies in the scene change

Browse source
This commit is contained in:
Julia 2024-01-29 11:49:57 -05:00 • committed by Julia
parent 849a1324f7
commit 941e838be9
3 changed files with 44 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/collab_ui/src/collab_panel.rs
View file

@ -2495,6 +2495,7 @@ impl CollabPanel {
h_flex() h_flex()
.absolute() .absolute()
.right(rems(0.)) .right(rems(0.))
.z_index(1)
.h_full() .h_full()
.child( .child(
h_flex() h_flex()

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

@ -328,7 +328,13 @@ impl Element for AnyView {
element.draw(bounds.origin, bounds.size.into(), cx); element.draw(bounds.origin, bounds.size.into(), cx);
} }
state.next_stacking_order_id = cx.window.next_frame.next_stacking_order_id; state.next_stacking_order_id = cx
.window
.next_frame
.next_stacking_order_ids
.last()
.copied()
.unwrap();
state.cache_key = Some(ViewCacheKey { state.cache_key = Some(ViewCacheKey {
bounds, bounds,
stacking_order: cx.stacking_order().clone(), stacking_order: cx.stacking_order().clone(),

45
crates/gpui/src/window/element_cx.rs
View file

@ -59,7 +59,7 @@ pub(crate) struct Frame {
pub(crate) scene: Scene, pub(crate) scene: Scene,
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: u16, pub(crate) next_stacking_order_ids: Vec<u16>,
pub(crate) next_root_z_index: u16, pub(crate) next_root_z_index: u16,
pub(crate) content_mask_stack: Vec<ContentMask<Pixels>>, pub(crate) content_mask_stack: Vec<ContentMask<Pixels>>,
pub(crate) element_offset_stack: Vec<Point<Pixels>>, pub(crate) element_offset_stack: Vec<Point<Pixels>>,
@ -85,7 +85,7 @@ impl Frame {
scene: Scene::default(), scene: Scene::default(),
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_ids: vec![0],
next_root_z_index: 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(),
@ -106,7 +106,7 @@ impl Frame {
self.mouse_listeners.values_mut().for_each(Vec::clear); self.mouse_listeners.values_mut().for_each(Vec::clear);
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_ids = vec![0];
self.next_root_z_index = 0; self.next_root_z_index = 0;
self.reused_views.clear(); self.reused_views.clear();
self.scene.clear(); self.scene.clear();
@ -351,8 +351,22 @@ impl<'a> ElementContext<'a> {
} }
} }
debug_assert!(next_stacking_order_id >= self.window.next_frame.next_stacking_order_id); debug_assert!(
self.window.next_frame.next_stacking_order_id = next_stacking_order_id; next_stacking_order_id
>= self
.window
.next_frame
.next_stacking_order_ids
.last()
.copied()
.unwrap()
);
*self
.window
.next_frame
.next_stacking_order_ids
.last_mut()
.unwrap() = next_stacking_order_id;
} }
/// Push a text style onto the stack, and call a function with that style active. /// Push a text style onto the stack, and call a function with that style active.
@ -434,8 +448,13 @@ impl<'a> ElementContext<'a> {
}; };
let new_root_z_index = post_inc(&mut self.window_mut().next_frame.next_root_z_index); let new_root_z_index = post_inc(&mut self.window_mut().next_frame.next_root_z_index);
let new_stacking_order_id = let new_stacking_order_id = post_inc(
post_inc(&mut self.window_mut().next_frame.next_stacking_order_id); self.window_mut()
.next_frame
.next_stacking_order_ids
.last_mut()
.unwrap(),
);
let new_context = StackingContext { let new_context = StackingContext {
z_index: new_root_z_index, z_index: new_root_z_index,
id: new_stacking_order_id, id: new_stacking_order_id,
@ -455,8 +474,14 @@ impl<'a> ElementContext<'a> {
/// Called during painting to invoke the given closure in a new stacking context. The given /// Called during painting to invoke the given closure in a new stacking context. The given
/// z-index is interpreted relative to the previous call to `stack`. /// z-index is interpreted relative to the previous call to `stack`.
pub fn with_z_index<R>(&mut self, z_index: u16, f: impl FnOnce(&mut Self) -> R) -> R { pub fn with_z_index<R>(&mut self, z_index: u16, f: impl FnOnce(&mut Self) -> R) -> R {
let new_stacking_order_id = let new_stacking_order_id = post_inc(
post_inc(&mut self.window_mut().next_frame.next_stacking_order_id); self.window_mut()
.next_frame
.next_stacking_order_ids
.last_mut()
.unwrap(),
);
self.window_mut().next_frame.next_stacking_order_ids.push(0);
let new_context = StackingContext { let new_context = StackingContext {
z_index, z_index,
id: new_stacking_order_id, id: new_stacking_order_id,
@ -466,6 +491,8 @@ impl<'a> ElementContext<'a> {
let result = f(self); let result = f(self);
self.window_mut().next_frame.z_index_stack.pop(); self.window_mut().next_frame.z_index_stack.pop();
self.window_mut().next_frame.next_stacking_order_ids.pop();
result result
} }