Skip to content

Resize split windows with mouse #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edwin-zvs merged 1 commit into from
May 30, 2026
Merged

Resize split windows with mouse #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 124 additions & 1 deletion crates/cli/src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,9 @@ pub struct App {
/// `Some((anchor_row, anchor_height))` while the user drags the
/// Matrix-rain title bar to resize the panel.
pub resizing_matrix_rain: Option<(u16, u16)>,
/// Split-window divider drag: parent split id, direction, drag-start
/// coordinate, drag-start ratio, and parent split area.
pub resizing_main_window: Option<(u64, WindowSplitDirection, u16, u16, ratatui::layout::Rect)>,
/// User has collapsed the session list pane via the `−` button
/// on its title bar. Effective only when the list pane doesn't
/// have focus — when focus is on the list (e.g. via `C-x o`),
Expand Down Expand Up @@ -1115,12 +1118,22 @@ pub struct WindowPaneHit {
pub inner_area: ratatui::layout::Rect,
}

#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub struct WindowDividerHit {
pub parent: u64,
pub direction: WindowSplitDirection,
pub area: ratatui::layout::Rect,
pub parent_area: ratatui::layout::Rect,
pub ratio_percent: u16,
}

/// Last-frame geometry for hit-testing mouse clicks.
#[derive(Debug, Clone, Default)]
pub struct LayoutSnapshot {
pub list_area: Option<ratatui::layout::Rect>,
pub view_area: Option<ratatui::layout::Rect>,
pub main_window_areas: Vec<WindowPaneHit>,
pub main_window_dividers: Vec<WindowDividerHit>,
pub pin_strip_area: Option<ratatui::layout::Rect>,
pub matrix_rain_area: Option<ratatui::layout::Rect>,
pub minibuffer_area: Option<ratatui::layout::Rect>,
Expand Down Expand Up @@ -1382,6 +1395,7 @@ pub async fn run_with_socket(socket: std::path::PathBuf) -> Result<()> {
resizing_pin_strip: None,
matrix_rain_h: persisted.matrix_rain_h,
resizing_matrix_rain: None,
resizing_main_window: None,
list_collapsed: persisted.list_collapsed,
editor_states: HashMap::new(),
agent_statuses: HashMap::new(),
Expand Down Expand Up @@ -2813,6 +2827,32 @@ impl App {
self.set_status("only current window".into());
}

fn set_split_ratio_by_order(&mut self, target_parent: u64, ratio: u16) -> bool {
fn set(node: &mut MainWindowTree, target_parent: u64, next: &mut u64, ratio: u16) -> bool {
match node {
MainWindowTree::Leaf { .. } => false,
MainWindowTree::Split {
ratio_percent,
first,
second,
..
} => {
let current = *next;
*next += 1;
if current == target_parent {
*ratio_percent = ratio.clamp(10, 90);
true
} else {
set(first, target_parent, next, ratio)
|| set(second, target_parent, next, ratio)
}
}
}
}
let mut next = 1;
set(&mut self.main_windows, target_parent, &mut next, ratio)
}

fn resize_active_window(&mut self, delta: i16, direction: WindowSplitDirection) {
fn resize(
node: &mut MainWindowTree,
Expand Down Expand Up @@ -3446,6 +3486,26 @@ impl App {
self.resizing_list = Some((ev.column, self.list_panel_w));
return;
}
if let Some(hit) = self
.layout
.main_window_dividers
.iter()
.find(|hit| Self::rect_contains(hit.area, ev.column, ev.row))
.copied()
{
let anchor = match hit.direction {
WindowSplitDirection::Right => ev.column,
WindowSplitDirection::Below => ev.row,
};
self.resizing_main_window = Some((
hit.parent,
hit.direction,
anchor,
hit.ratio_percent,
hit.parent_area,
));
return;
}
// View ↔ pin-strip horizontal divider: clicking the
// view's bottom border (or equivalently the pin
// strip's top border, the same row) starts a
Expand Down Expand Up @@ -3535,6 +3595,22 @@ impl App {
let available = self.matrix_rain_available_height().unwrap_or(raw);
self.matrix_rain_h =
Some(crate::ui::matrix_rain_panel_height(Some(raw), available));
} else if let Some((parent, direction, anchor, ratio, parent_area)) =
self.resizing_main_window
{
let (delta, span) = match direction {
WindowSplitDirection::Right => (
ev.column as i32 - anchor as i32,
parent_area.width.max(1) as i32,
),
WindowSplitDirection::Below => (
ev.row as i32 - anchor as i32,
parent_area.height.max(1) as i32,
),
};
let delta_pct = (delta * 100) / span;
let next = (ratio as i32 + delta_pct).clamp(10, 90) as u16;
self.set_split_ratio_by_order(parent, next);
} else if let Some((grab_offset, max_scrollback)) = self.dragging_terminal_scrollbar
{
self.drag_terminal_scrollbar_to_row(ev.row, grab_offset, max_scrollback);
Expand All @@ -3554,12 +3630,14 @@ impl App {
|| self.resizing_pin_strip.is_some()
|| self.resizing_orchestrator_panel.is_some()
|| self.dragging_terminal_scrollbar.is_some()
|| self.resizing_matrix_rain.is_some();
|| self.resizing_matrix_rain.is_some()
|| self.resizing_main_window.is_some();
self.resizing_list = None;
self.resizing_pin_strip = None;
self.resizing_orchestrator_panel = None;
self.dragging_terminal_scrollbar = None;
self.resizing_matrix_rain = None;
self.resizing_main_window = None;
if was_resizing {
self.text_selection = None;
return;
Expand Down Expand Up @@ -6865,6 +6943,7 @@ mod tests {
area: Rect::new(20, 0, 80, 20),
inner_area: Rect::new(21, 1, 78, 18),
}],
main_window_dividers: Vec::new(),
pin_strip_area: Some(Rect::new(20, 20, 80, 8)),
matrix_rain_area: None,
minibuffer_area: Some(Rect::new(0, 29, 100, 4)),
Expand Down Expand Up @@ -6948,6 +7027,7 @@ mod tests {
resizing_pin_strip: None,
matrix_rain_h: None,
resizing_matrix_rain: None,
resizing_main_window: None,
list_collapsed: false,
tasks_popup: None,
remote_control_popup: None,
Expand Down Expand Up @@ -7087,6 +7167,49 @@ mod tests {
server.abort();
}

#[tokio::test]
async fn set_split_ratio_by_render_order_updates_nested_split() {
let (mut app, _dir, server) = captured_app().await;
app.main_windows = MainWindowTree::Split {
direction: WindowSplitDirection::Right,
ratio_percent: 50,
first: Box::new(MainWindowTree::Leaf {
id: 1,
selection: Selection::Session("s1".into()),
}),
second: Box::new(MainWindowTree::Split {
direction: WindowSplitDirection::Below,
ratio_percent: 40,
first: Box::new(MainWindowTree::Leaf {
id: 2,
selection: Selection::Session("s1".into()),
}),
second: Box::new(MainWindowTree::Leaf {
id: 3,
selection: Selection::Session("s1".into()),
}),
}),
};

assert!(app.set_split_ratio_by_order(2, 65));

match &app.main_windows {
MainWindowTree::Split {
ratio_percent,
second,
..
} => {
assert_eq!(*ratio_percent, 50);
match second.as_ref() {
MainWindowTree::Split { ratio_percent, .. } => assert_eq!(*ratio_percent, 65),
MainWindowTree::Leaf { .. } => panic!("expected nested split"),
}
}
MainWindowTree::Leaf { .. } => panic!("expected root split"),
}
server.abort();
}

#[tokio::test]
async fn split_windows_track_individual_pty_sizes() {
let (mut app, _dir, server) = captured_app().await;
Expand Down
47 changes: 42 additions & 5 deletions crates/cli/src/ui.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use crate::app::{
App, HarnessHit, HintZone, ListItem as AppListItem, MainWindowTree, Minibuffer,
MinibufferIntent, PaneFocus, ScreenPoint, Selection, TextSelectionRange, ViewMode,
WindowPaneHit, WindowSplitDirection, ZoomMode,
WindowDividerHit, WindowPaneHit, WindowSplitDirection, ZoomMode,
};
use crate::keymap::KeyAction;
use crate::theme::Theme;
Expand Down Expand Up @@ -104,6 +104,7 @@ pub fn render(f: &mut Frame, app: &mut App) {
app.layout.dynamic_ui_trigger = None;
app.layout.dynamic_ui_triggers.clear();
app.layout.main_window_areas.clear();
app.layout.main_window_dividers.clear();
app.window_pane_sizes.clear();
app.layout.dynamic_ui_popover_area = None;
app.layout.dynamic_ui_scroll_metrics = None;
Expand Down Expand Up @@ -2155,7 +2156,13 @@ fn render_pin_transition(f: &mut Frame, area: Rect, app: &App, session_id: &str)
}

fn render_main_windows(f: &mut Frame, area: Rect, app: &mut App) {
fn render_node(f: &mut Frame, area: Rect, app: &mut App, node: &MainWindowTree) {
fn render_node(
f: &mut Frame,
area: Rect,
app: &mut App,
node: &MainWindowTree,
next_split_id: &mut u64,
) {
match node {
MainWindowTree::Leaf { id, selection } => {
let old_selection = app.selection.clone();
Expand Down Expand Up @@ -2183,6 +2190,8 @@ fn render_main_windows(f: &mut Frame, area: Rect, app: &mut App) {
first,
second,
} => {
let split_id = *next_split_id;
*next_split_id += 1;
let first_pct = (*ratio_percent).clamp(10, 90);
let chunks = Layout::default()
.direction(match direction {
Expand All @@ -2194,13 +2203,41 @@ fn render_main_windows(f: &mut Frame, area: Rect, app: &mut App) {
Constraint::Percentage(100 - first_pct),
])
.split(area);
render_node(f, chunks[0], app, first);
render_node(f, chunks[1], app, second);
let divider = match direction {
WindowSplitDirection::Right => Rect::new(
chunks[0]
.x
.saturating_add(chunks[0].width)
.saturating_sub(1),
area.y,
2.min(area.width),
area.height,
),
WindowSplitDirection::Below => Rect::new(
area.x,
chunks[0]
.y
.saturating_add(chunks[0].height)
.saturating_sub(1),
area.width,
2.min(area.height),
),
};
app.layout.main_window_dividers.push(WindowDividerHit {
parent: split_id,
direction: *direction,
area: divider,
parent_area: area,
ratio_percent: first_pct,
});
render_node(f, chunks[0], app, first, next_split_id);
render_node(f, chunks[1], app, second, next_split_id);
}
}
}
let tree = app.main_windows.clone();
render_node(f, area, app, &tree);
let mut next_split_id = 1;
render_node(f, area, app, &tree, &mut next_split_id);
}

fn render_detail(f: &mut Frame, area: Rect, app: &mut App, window_id: Option<u64>) {
Expand Down
Loading