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

Fix dock split resizin

Browse source
This commit is contained in:
Mikayla 2023-12-13 15:14:51 -08:00
parent a807e798ec
commit e2bfd46455
No known key found for this signature in database
2 changed files with 41 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

35
crates/workspace2/src/dock.rs
View file

@ -1,9 +1,10 @@
use crate::DraggedDock; use crate::DraggedDock;
use crate::{status_bar::StatusItemView, Workspace}; use crate::{status_bar::StatusItemView, Workspace};
use gpui::{ use gpui::{
div, px, Action, AnchorCorner, AnyView, AppContext, Axis, ClickEvent, Div, Entity, EntityId, div, px, red, Action, AnchorCorner, AnyView, AppContext, Axis, ClickEvent, Div, Entity,
EventEmitter, FocusHandle, FocusableView, IntoElement, MouseButton, ParentElement, Render, EntityId, EventEmitter, FocusHandle, FocusableView, IntoElement, MouseButton, ParentElement,
SharedString, Styled, Subscription, View, ViewContext, VisualContext, WeakView, WindowContext, Render, SharedString, Styled, Subscription, View, ViewContext, VisualContext, WeakView,
WindowContext,
}; };
use schemars::JsonSchema; use schemars::JsonSchema;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@ -492,7 +493,8 @@ impl Render for Dock {
let position = self.position; let position = self.position;
let handler = div() let handler = div()
.id("resize-handle") .id("resize-handle")
.bg(cx.theme().colors().border) // .bg(cx.theme().colors().border)
.bg(red())
.on_drag(move |cx| cx.build_view(|_| DraggedDock(position))) .on_drag(move |cx| cx.build_view(|_| DraggedDock(position)))
.on_click(cx.listener(|v, e: &ClickEvent, cx| { .on_click(cx.listener(|v, e: &ClickEvent, cx| {
if e.down.button == MouseButton::Left && e.down.click_count == 2 { if e.down.button == MouseButton::Left && e.down.click_count == 2 {
@ -500,23 +502,29 @@ impl Render for Dock {
} }
})); }));
const HANDLE_SIZE: Pixels = Pixels(4. * 3.);
match self.position() { match self.position() {
DockPosition::Left => { DockPosition::Left => {
post_resize_handle = Some(handler.w_1().h_full().cursor_col_resize()) post_resize_handle =
Some(handler.min_w(HANDLE_SIZE).h_full().cursor_col_resize())
} }
DockPosition::Bottom => { DockPosition::Bottom => {
pre_resize_handle = Some(handler.w_full().h_1().cursor_row_resize()) pre_resize_handle =
Some(handler.w_full().min_h(HANDLE_SIZE).cursor_row_resize())
} }
DockPosition::Right => { DockPosition::Right => {
pre_resize_handle = Some(handler.w_full().h_1().cursor_col_resize()) pre_resize_handle =
Some(handler.min_w(HANDLE_SIZE).h_full().cursor_col_resize())
} }
} }
div() div()
.flex()
.border_color(cx.theme().colors().border) .border_color(cx.theme().colors().border)
.map(|this| match self.position().axis() { .map(|this| match self.position().axis() {
Axis::Horizontal => this.w(px(size)).h_full(), Axis::Horizontal => this.w(px(size)).h_full().flex_row(),
Axis::Vertical => this.h(px(size)).w_full(), Axis::Vertical => this.h(px(size)).w_full().flex_col(),
}) })
.map(|this| match self.position() { .map(|this| match self.position() {
DockPosition::Left => this.border_r(), DockPosition::Left => this.border_r(),
@ -524,7 +532,14 @@ impl Render for Dock {
DockPosition::Bottom => this.border_t(), DockPosition::Bottom => this.border_t(),
}) })
.children(pre_resize_handle) .children(pre_resize_handle)
.child(entry.panel.to_any()) .child(
div()
.map(|this| match self.position().axis() {
Axis::Horizontal => this.min_w(px(size) - HANDLE_SIZE).h_full(),
Axis::Vertical => this.min_h(px(size) - HANDLE_SIZE).w_full(),
})
.child(entry.panel.to_any()),
)
.children(post_resize_handle) .children(post_resize_handle)
} else { } else {
div() div()

25
crates/workspace2/src/workspace2.rs
View file

@ -29,9 +29,9 @@ use futures::{
Future, FutureExt, StreamExt, Future, FutureExt, StreamExt,
}; };
use gpui::{ use gpui::{
actions, canvas, div, impl_actions, point, size, Action, AnyModel, AnyView, AnyWeakView, actions, canvas, div, impl_actions, outline, point, size, Action, AnyModel, AnyView,
AnyWindowHandle, AppContext, AsyncAppContext, AsyncWindowContext, Bounds, Context, Div, AnyWeakView, AnyWindowHandle, AppContext, AsyncAppContext, AsyncWindowContext, Bounds, Context,
DragMoveEvent, Entity, EntityId, EventEmitter, FocusHandle, FocusableView, GlobalPixels, Div, DragMoveEvent, Entity, EntityId, EventEmitter, FocusHandle, FocusableView, GlobalPixels,
InteractiveElement, KeyContext, ManagedView, Model, ModelContext, ParentElement, InteractiveElement, KeyContext, ManagedView, Model, ModelContext, ParentElement,
PathPromptOptions, Pixels, Point, PromptLevel, Render, Size, Styled, Subscription, Task, View, PathPromptOptions, Pixels, Point, PromptLevel, Render, Size, Styled, Subscription, Task, View,
ViewContext, VisualContext, WeakView, WindowBounds, WindowContext, WindowHandle, WindowOptions, ViewContext, VisualContext, WeakView, WindowBounds, WindowContext, WindowHandle, WindowOptions,
@ -3627,26 +3627,33 @@ impl Render for Workspace {
.border_t() .border_t()
.border_b() .border_b()
.border_color(cx.theme().colors().border) .border_color(cx.theme().colors().border)
.child(canvas( .child(
cx.listener(|workspace, bounds, cx| workspace.bounds = *bounds), canvas(cx.listener(|workspace, bounds, cx| {
)) cx.with_z_index(100, |cx| {
cx.paint_quad(outline(*bounds, gpui::green()));
});
workspace.bounds = *bounds;
}))
.absolute()
.size_full(),
)
.on_drag_move( .on_drag_move(
cx.listener(|workspace, e: &DragMoveEvent<DraggedDock>, cx| { cx.listener(|workspace, e: &DragMoveEvent<DraggedDock>, cx| {
match e.drag.read(cx).0 { match e.drag.read(cx).0 {
DockPosition::Left => { DockPosition::Left => {
let size = e.event.position.x; let size = workspace.bounds.left() + e.event.position.x;
workspace.left_dock.update(cx, |left_dock, cx| { workspace.left_dock.update(cx, |left_dock, cx| {
left_dock.resize_active_panel(Some(size.0), cx); left_dock.resize_active_panel(Some(size.0), cx);
}); });
} }
DockPosition::Right => { DockPosition::Right => {
let size = workspace.bounds.size.width - e.event.position.x; let size = workspace.bounds.right() - e.event.position.x;
workspace.right_dock.update(cx, |right_dock, cx| { workspace.right_dock.update(cx, |right_dock, cx| {
right_dock.resize_active_panel(Some(size.0), cx); right_dock.resize_active_panel(Some(size.0), cx);
}); });
} }
DockPosition::Bottom => { DockPosition::Bottom => {
let size = workspace.bounds.size.height - e.event.position.y; let size = workspace.bounds.bottom() - e.event.position.y;
workspace.bottom_dock.update(cx, |bottom_dock, cx| { workspace.bottom_dock.update(cx, |bottom_dock, cx| {
bottom_dock.resize_active_panel(Some(size.0), cx); bottom_dock.resize_active_panel(Some(size.0), cx);
}); });