Remove 2 suffix for welcome, vcs_menu, quick_action_bar, collab_ui

Co-authored-by: Mikayla <mikayla@zed.dev>

crates/collab_ui/src/face_pile.rs

@@ -1,113 +1,30 @@
-use std::ops::Range;
-
 use gpui::{
-    geometry::{
-        rect::RectF,
-        vector::{vec2f, Vector2F},
-    },
-    json::ToJson,
-    serde_json::{self, json},
-    AnyElement, Axis, Element, View, ViewContext,
+    div, AnyElement, ElementId, IntoElement, ParentElement, RenderOnce, Styled, WindowContext,
 };
+use smallvec::SmallVec;
 
-pub(crate) struct FacePile<V: View> {
-    overlap: f32,
-    faces: Vec<AnyElement<V>>,
+#[derive(Default, IntoElement)]
+pub struct FacePile {
+    pub faces: SmallVec<[AnyElement; 2]>,
 }
 
-impl<V: View> FacePile<V> {
-    pub fn new(overlap: f32) -> Self {
-        Self {
-            overlap,
-            faces: Vec::new(),
-        }
+impl RenderOnce for FacePile {
+    fn render(self, _: &mut WindowContext) -> impl IntoElement {
+        let player_count = self.faces.len();
+        let player_list = self.faces.into_iter().enumerate().map(|(ix, player)| {
+            let isnt_last = ix < player_count - 1;
+
+            div()
+                .z_index((player_count - ix) as u8)
+                .when(isnt_last, |div| div.neg_mr_1())
+                .child(player)
+        });
+        div().p_1().flex().items_center().children(player_list)
     }
 }
 
-impl<V: View> Element<V> for FacePile<V> {
-    type LayoutState = ();
-    type PaintState = ();
-
-    fn layout(
-        &mut self,
-        constraint: gpui::SizeConstraint,
-        view: &mut V,
-        cx: &mut ViewContext<V>,
-    ) -> (Vector2F, Self::LayoutState) {
-        debug_assert!(constraint.max_along(Axis::Horizontal) == f32::INFINITY);
-
-        let mut width = 0.;
-        let mut max_height = 0.;
-        for face in &mut self.faces {
-            let layout = face.layout(constraint, view, cx);
-            width += layout.x();
-            max_height = f32::max(max_height, layout.y());
-        }
-        width -= self.overlap * self.faces.len().saturating_sub(1) as f32;
-
-        (
-            Vector2F::new(width, max_height.clamp(1., constraint.max.y())),
-            (),
-        )
-    }
-
-    fn paint(
-        &mut self,
-        bounds: RectF,
-        visible_bounds: RectF,
-        _layout: &mut Self::LayoutState,
-        view: &mut V,
-        cx: &mut ViewContext<V>,
-    ) -> Self::PaintState {
-        let visible_bounds = bounds.intersection(visible_bounds).unwrap_or_default();
-
-        let origin_y = bounds.upper_right().y();
-        let mut origin_x = bounds.upper_right().x();
-
-        for face in self.faces.iter_mut().rev() {
-            let size = face.size();
-            origin_x -= size.x();
-            let origin_y = origin_y + (bounds.height() - size.y()) / 2.0;
-
-            cx.scene().push_layer(None);
-            face.paint(vec2f(origin_x, origin_y), visible_bounds, view, cx);
-            cx.scene().pop_layer();
-            origin_x += self.overlap;
-        }
-
-        ()
-    }
-
-    fn rect_for_text_range(
-        &self,
-        _: Range<usize>,
-        _: RectF,
-        _: RectF,
-        _: &Self::LayoutState,
-        _: &Self::PaintState,
-        _: &V,
-        _: &ViewContext<V>,
-    ) -> Option<RectF> {
-        None
-    }
-
-    fn debug(
-        &self,
-        bounds: RectF,
-        _: &Self::LayoutState,
-        _: &Self::PaintState,
-        _: &V,
-        _: &ViewContext<V>,
-    ) -> serde_json::Value {
-        json!({
-            "type": "FacePile",
-            "bounds": bounds.to_json()
-        })
-    }
-}
-
-impl<V: View> Extend<AnyElement<V>> for FacePile<V> {
-    fn extend<T: IntoIterator<Item = AnyElement<V>>>(&mut self, children: T) {
-        self.faces.extend(children);
+impl ParentElement for FacePile {
+    fn children_mut(&mut self) -> &mut SmallVec<[AnyElement; 2]> {
+        &mut self.faces
     }
 }