Move workspace overlay elements into an actual overlay in order to get proper stacking context depths

Co-Authored-By: Mikayla Maki <mikayla@zed.dev>

crates/drag_and_drop/src/drag_and_drop.rs

@@ -2,7 +2,7 @@ use std::{any::Any, rc::Rc};
 
 use collections::HashSet;
 use gpui::{
-    elements::{Container, MouseEventHandler},
+    elements::{Container, MouseEventHandler, Overlay},
     geometry::vector::Vector2F,
     scene::DragRegionEvent,
     CursorStyle, Element, ElementBox, EventContext, MouseButton, MutableAppContext, RenderContext,
@@ -116,14 +116,9 @@ impl<V: View> DragAndDrop<V> {
 
                 enum DraggedElementHandler {}
                 Some(
+                    Overlay::new(
                         MouseEventHandler::<DraggedElementHandler>::new(0, cx, |_, cx| {
-                        Container::new(render(payload, cx))
+                            render(payload, cx)
-                            .with_margin_left(position.x())
-                            .with_margin_top(position.y())
-                            .aligned()
-                            .top()
-                            .left()
-                            .boxed()
                         })
                         .with_cursor_style(CursorStyle::Arrow)
                         .on_up(MouseButton::Left, |_, cx| {
@@ -141,6 +136,9 @@ impl<V: View> DragAndDrop<V> {
                         .with_hoverable(false)
                         .boxed(),
                     )
+                    .with_anchor_position(position)
+                    .boxed(),
+                )
             },
         )
     }

crates/gpui/src/elements/overlay.rs

@@ -12,8 +12,8 @@ use serde_json::json;
 pub struct Overlay {
     child: ElementBox,
     anchor_position: Option<Vector2F>,
-    fit_mode: OverlayFitMode,
     anchor_corner: AnchorCorner,
+    fit_mode: OverlayFitMode,
     hoverable: bool,
 }
 
@@ -71,8 +71,8 @@ impl Overlay {
         Self {
             child,
             anchor_position: None,
-            fit_mode: OverlayFitMode::None,
             anchor_corner: AnchorCorner::TopLeft,
+            fit_mode: OverlayFitMode::None,
             hoverable: false,
         }
     }
@@ -183,14 +183,13 @@ impl Element for Overlay {
 
         if self.hoverable {
             enum OverlayHoverCapture {}
-            cx.scene.push_mouse_region(
+            // Block hovers in lower stacking contexts
-                MouseRegion::new::<OverlayHoverCapture>(
+            cx.scene
+                .push_mouse_region(MouseRegion::new::<OverlayHoverCapture>(
                     cx.current_view_id(),
                     cx.current_view_id(),
                     bounds,
-                )
+                ));
-                .with_hoverable(true),
-            );
         }
 
         self.child.paint(bounds.origin(), bounds, cx);

crates/workspace/src/dock.rs

@@ -150,6 +150,7 @@ impl Dock {
         cx: &mut RenderContext<Workspace>,
     ) -> Option<ElementBox> {
         let style = &theme.workspace.dock;
+
         self.position
             .visible()
             .filter(|current_anchor| *current_anchor == anchor)

crates/workspace/src/workspace.rs

@@ -2618,7 +2618,14 @@ impl View for Workspace {
                                     )
                                     .boxed()
                             })
-                            .with_children(self.dock.render(&theme, DockAnchor::Expanded, cx))
+                            .with_child(
+                                Overlay::new(
+                                    Stack::new()
+                                        .with_children(self.dock.render(
+                                            &theme,
+                                            DockAnchor::Expanded,
+                                            cx,
+                                        ))
                                         .with_children(self.modal.as_ref().map(|m| {
                                             ChildView::new(m)
                                                 .contained()
@@ -2628,6 +2635,10 @@ impl View for Workspace {
                                                 .boxed()
                                         }))
                                         .with_children(self.render_notifications(&theme.workspace))
+                                        .boxed(),
+                                )
+                                .boxed(),
+                            )
                             .flex(1.0, true)
                             .boxed(),
                     )