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

Add pane dividers (#3703)

Browse source 
This PR adds dividers between panes in a split.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2023-12-18 16:32:51 -05:00 • committed by GitHub
parent 6da0fa98e2
commit 64ceb61aa3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/workspace2/src/pane_group.rs
View file

@ -570,9 +570,12 @@ mod element {
}; };
use parking_lot::Mutex; use parking_lot::Mutex;
use smallvec::SmallVec; use smallvec::SmallVec;
use ui::prelude::*;
use super::{HANDLE_HITBOX_SIZE, HORIZONTAL_MIN_SIZE, VERTICAL_MIN_SIZE}; use super::{HANDLE_HITBOX_SIZE, HORIZONTAL_MIN_SIZE, VERTICAL_MIN_SIZE};
const DIVIDER_SIZE: f32 = 1.0;
pub fn pane_axis( pub fn pane_axis(
axis: Axis, axis: Axis,
basis: usize, basis: usize,
@ -699,12 +702,18 @@ mod element {
cx: &mut WindowContext, cx: &mut WindowContext,
) { ) {
let handle_bounds = Bounds { let handle_bounds = Bounds {
origin: pane_bounds.origin.apply_along(axis, |o| { origin: pane_bounds.origin.apply_along(axis, |origin| {
o + pane_bounds.size.along(axis) - Pixels(HANDLE_HITBOX_SIZE / 2.) origin + pane_bounds.size.along(axis) - px(HANDLE_HITBOX_SIZE / 2.)
}), }),
size: pane_bounds size: pane_bounds
.size .size
.apply_along(axis, |_| Pixels(HANDLE_HITBOX_SIZE)), .apply_along(axis, |_| px(HANDLE_HITBOX_SIZE)),
};
let divider_bounds = Bounds {
origin: pane_bounds
.origin
.apply_along(axis, |origin| origin + pane_bounds.size.along(axis)),
size: pane_bounds.size.apply_along(axis, |_| px(DIVIDER_SIZE)),
}; };
cx.with_z_index(3, |cx| { cx.with_z_index(3, |cx| {
@ -716,6 +725,7 @@ mod element {
} }
cx.add_opaque_layer(handle_bounds); cx.add_opaque_layer(handle_bounds);
cx.paint_quad(gpui::fill(divider_bounds, cx.theme().colors().border));
cx.on_mouse_event({ cx.on_mouse_event({
let dragged_handle = dragged_handle.clone(); let dragged_handle = dragged_handle.clone();
@ -790,7 +800,7 @@ mod element {
for (ix, child) in self.children.iter_mut().enumerate() { for (ix, child) in self.children.iter_mut().enumerate() {
//todo!(active_pane_magnification) //todo!(active_pane_magnification)
// If usign active pane magnification, need to switch to using // If using active pane magnification, need to switch to using
// 1 for all non-active panes, and then the magnification for the // 1 for all non-active panes, and then the magnification for the
// active pane. // active pane.
let child_size = bounds let child_size = bounds