Conrad Irwin created
This reverts commit 28a23372185c7a30c7790085a6a010c3cad6ad09, reversing
changes made to e992f84735a2ca166a7388d4eca69a6b4e6ee212.crates/collab_ui/src/face_pile.rs | 2
crates/gpui/src/style.rs | 8 +-
crates/gpui/src/styled.rs | 2
crates/gpui/src/window.rs | 71 +++++++++++++-------------
crates/storybook/src/stories/z_index.rs | 4
crates/ui/src/styles/elevation.rs | 2
crates/workspace/src/workspace.rs | 2
7 files changed, 45 insertions(+), 46 deletions(-)
@@ -13,7 +13,7 @@ impl RenderOnce for FacePile {
let isnt_last = ix < player_count - 1;
div()
- .z_index((player_count - ix) as u16)
+ .z_index((player_count - ix) as u8)
.when(isnt_last, |div| div.neg_mr_1())
.child(player)
});
@@ -110,7 +110,7 @@ pub struct Style {
/// The mouse cursor style shown when the mouse pointer is over an element.
pub mouse_cursor: Option<CursorStyle>,
- pub z_index: Option<u16>,
+ pub z_index: Option<u8>,
#[cfg(debug_assertions)]
pub debug: bool,
@@ -386,7 +386,7 @@ impl Style {
let background_color = self.background.as_ref().and_then(Fill::color);
if background_color.map_or(false, |color| !color.is_transparent()) {
- cx.with_z_index(1, |cx| {
+ cx.with_z_index(0, |cx| {
let mut border_color = background_color.unwrap_or_default();
border_color.a = 0.;
cx.paint_quad(quad(
@@ -399,12 +399,12 @@ impl Style {
});
}
- cx.with_z_index(2, |cx| {
+ cx.with_z_index(0, |cx| {
continuation(cx);
});
if self.is_border_visible() {
- cx.with_z_index(3, |cx| {
+ cx.with_z_index(0, |cx| {
let corner_radii = self.corner_radii.to_pixels(bounds.size, rem_size);
let border_widths = self.border_widths.to_pixels(rem_size);
let max_border_width = border_widths.max();
@@ -12,7 +12,7 @@ pub trait Styled: Sized {
gpui_macros::style_helpers!();
- fn z_index(mut self, z_index: u16) -> Self {
+ fn z_index(mut self, z_index: u8) -> Self {
self.style().z_index = Some(z_index);
self
}
@@ -43,23 +43,30 @@ use std::{
};
use util::{post_inc, ResultExt};
-const ACTIVE_DRAG_Z_INDEX: u16 = 1;
+const ACTIVE_DRAG_Z_INDEX: u8 = 1;
/// A global stacking order, which is created by stacking successive z-index values.
/// Each z-index will always be interpreted in the context of its parent z-index.
-#[derive(Debug, Deref, DerefMut, Clone, Ord, PartialOrd, PartialEq, Eq, Default)]
-pub struct StackingOrder(SmallVec<[StackingContext; 64]>);
-
-/// A single entry in a primitive's z-index stacking order
-#[derive(Clone, Ord, PartialOrd, PartialEq, Eq, Default)]
-pub struct StackingContext {
- z_index: u16,
- id: u16,
+#[derive(Deref, DerefMut, Clone, Ord, PartialOrd, PartialEq, Eq, Default)]
+pub struct StackingOrder {
+ #[deref]
+ #[deref_mut]
+ context_stack: SmallVec<[u8; 64]>,
+ id: u32,
}
-impl std::fmt::Debug for StackingContext {
+impl std::fmt::Debug for StackingOrder {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- write!(f, "{{{}.{}}} ", self.z_index, self.id)
+ let mut stacks = self.context_stack.iter().peekable();
+ write!(f, "[({}): ", self.id)?;
+ while let Some(z_index) = stacks.next() {
+ write!(f, "{z_index}")?;
+ if stacks.peek().is_some() {
+ write!(f, "->")?;
+ }
+ }
+ write!(f, "]")?;
+ Ok(())
}
}
@@ -308,8 +315,8 @@ pub(crate) struct Frame {
pub(crate) scene: Scene,
pub(crate) depth_map: Vec<(StackingOrder, EntityId, Bounds<Pixels>)>,
pub(crate) z_index_stack: StackingOrder,
- next_stacking_order_id: u16,
- next_root_z_index: u16,
+ pub(crate) next_stacking_order_id: u32,
+ next_root_z_index: u8,
content_mask_stack: Vec<ContentMask<Pixels>>,
element_offset_stack: Vec<Point<Pixels>>,
requested_input_handler: Option<RequestedInputHandler>,
@@ -1104,11 +1111,7 @@ impl<'a> WindowContext<'a> {
if level >= opaque_level {
break;
}
- if opaque_level
- .first()
- .map(|c| c.z_index == ACTIVE_DRAG_Z_INDEX)
- .unwrap_or(false)
- {
+ if opaque_level.starts_with(&[ACTIVE_DRAG_Z_INDEX]) {
continue;
}
@@ -2455,40 +2458,36 @@ pub trait BorrowWindow: BorrowMut<Window> + BorrowMut<AppContext> {
size: self.window().viewport_size,
},
};
-
- let new_root_z_index = post_inc(&mut self.window_mut().next_frame.next_root_z_index);
let new_stacking_order_id =
post_inc(&mut self.window_mut().next_frame.next_stacking_order_id);
- let new_context = StackingContext {
- z_index: new_root_z_index,
- id: new_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);
-
- self.window_mut().next_frame.z_index_stack.push(new_context);
+ 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);
let result = f(self);
self.window_mut().next_frame.content_mask_stack.pop();
self.window_mut().next_frame.z_index_stack = old_stacking_order;
-
result
}
/// 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`.
- fn with_z_index<R>(&mut self, z_index: u16, f: impl FnOnce(&mut Self) -> R) -> R {
+ fn with_z_index<R>(&mut self, z_index: u8, f: impl FnOnce(&mut Self) -> R) -> R {
let new_stacking_order_id =
post_inc(&mut self.window_mut().next_frame.next_stacking_order_id);
- let new_context = StackingContext {
- z_index,
- id: new_stacking_order_id,
- };
-
- self.window_mut().next_frame.z_index_stack.push(new_context);
+ let old_stacking_order_id = mem::replace(
+ &mut 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(z_index);
let result = f(self);
+ self.window_mut().next_frame.z_index_stack.id = old_stacking_order_id;
self.window_mut().next_frame.z_index_stack.pop();
-
result
}
@@ -76,7 +76,7 @@ impl Styles for Div {}
#[derive(IntoElement)]
struct ZIndexExample {
- z_index: u16,
+ z_index: u8,
}
impl RenderOnce for ZIndexExample {
@@ -166,7 +166,7 @@ impl RenderOnce for ZIndexExample {
}
impl ZIndexExample {
- pub fn new(z_index: u16) -> Self {
+ pub fn new(z_index: u8) -> Self {
Self { z_index }
}
}
@@ -20,7 +20,7 @@ pub enum ElevationIndex {
}
impl ElevationIndex {
- pub fn z_index(self) -> u16 {
+ pub fn z_index(self) -> u8 {
match self {
ElevationIndex::Background => 0,
ElevationIndex::Surface => 42,
@@ -4334,7 +4334,7 @@ impl Element for DisconnectedOverlay {
}
fn paint(&mut self, bounds: Bounds<Pixels>, overlay: &mut Self::State, cx: &mut WindowContext) {
- cx.with_z_index(u16::MAX, |cx| {
+ cx.with_z_index(u8::MAX, |cx| {
cx.add_opaque_layer(bounds);
overlay.paint(cx);
})