diff --git a/crates/workspace2/src/dock.rs b/crates/workspace2/src/dock.rs index 495fa01423..f9e294763b 100644 --- a/crates/workspace2/src/dock.rs +++ b/crates/workspace2/src/dock.rs @@ -1,10 +1,9 @@ use crate::DraggedDock; use crate::{status_bar::StatusItemView, Workspace}; use gpui::{ - div, px, red, Action, AnchorCorner, AnyView, AppContext, Axis, ClickEvent, Div, Entity, - EntityId, EventEmitter, FocusHandle, FocusableView, IntoElement, MouseButton, ParentElement, - Render, SharedString, Styled, Subscription, View, ViewContext, VisualContext, WeakView, - WindowContext, + div, px, Action, AnchorCorner, AnyView, AppContext, Axis, ClickEvent, Div, Entity, EntityId, + EventEmitter, FocusHandle, FocusableView, IntoElement, MouseButton, ParentElement, Render, + SharedString, Styled, Subscription, View, ViewContext, VisualContext, WeakView, WindowContext, }; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; @@ -493,16 +492,16 @@ impl Render for Dock { let position = self.position; let handler = div() .id("resize-handle") - // .bg(cx.theme().colors().border) - .bg(red()) + .bg(cx.theme().colors().border) .on_drag(move |cx| cx.build_view(|_| DraggedDock(position))) .on_click(cx.listener(|v, e: &ClickEvent, cx| { if e.down.button == MouseButton::Left && e.down.click_count == 2 { v.resize_active_panel(None, cx) } - })); + })) + .z_index(1); - const HANDLE_SIZE: Pixels = Pixels(4. * 3.); + const HANDLE_SIZE: Pixels = Pixels(6.); match self.position() { DockPosition::Left => { diff --git a/crates/workspace2/src/workspace2.rs b/crates/workspace2/src/workspace2.rs index c070bdfad2..629e151372 100644 --- a/crates/workspace2/src/workspace2.rs +++ b/crates/workspace2/src/workspace2.rs @@ -29,9 +29,9 @@ use futures::{ Future, FutureExt, StreamExt, }; use gpui::{ - actions, canvas, div, impl_actions, outline, point, size, Action, AnyModel, AnyView, - AnyWeakView, AnyWindowHandle, AppContext, AsyncAppContext, AsyncWindowContext, Bounds, Context, - Div, DragMoveEvent, Entity, EntityId, EventEmitter, FocusHandle, FocusableView, GlobalPixels, + actions, canvas, div, impl_actions, point, size, Action, AnyModel, AnyView, AnyWeakView, + AnyWindowHandle, AppContext, AsyncAppContext, AsyncWindowContext, Bounds, Context, Div, + DragMoveEvent, Entity, EntityId, EventEmitter, FocusHandle, FocusableView, GlobalPixels, InteractiveElement, KeyContext, ManagedView, Model, ModelContext, ParentElement, PathPromptOptions, Pixels, Point, PromptLevel, Render, Size, Styled, Subscription, Task, View, ViewContext, VisualContext, WeakView, WindowBounds, WindowContext, WindowHandle, WindowOptions, @@ -3629,9 +3629,6 @@ impl Render for Workspace { .border_color(cx.theme().colors().border) .child( canvas(cx.listener(|workspace, bounds, cx| { - cx.with_z_index(100, |cx| { - cx.paint_quad(outline(*bounds, gpui::green())); - }); workspace.bounds = *bounds; })) .absolute()