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

Add option to set split direction (#16345)

Browse source 
This adds an option to set the split direction for both the horizontal
splits, and the vertical splits.

A couple of things to look for when reviewing:

* The `derive` keywords on the Enums were copy pasted, no clue what they
should be
* Tried adding tests for this, but got stuck.

Co-authored with @Tobbe

Fixes: https://github.com/zed-industries/zed/issues/11342
This commit is contained in:
Jeroen van Baarsen 2024-08-22 16:53:43 +02:00 • committed by GitHub
parent f08be779c0
commit 3a593fe803
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 53 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/workspace/src/pane.rs
View file

@ -5,7 +5,10 @@ use crate::{
},
notifications::NotifyResultExt,
toolbar::Toolbar,
workspace_settings::{AutosaveSetting, TabBarSettings, WorkspaceSettings},
workspace_settings::{
AutosaveSetting, PaneSplitDirectionHorizontal, PaneSplitDirectionVertical, TabBarSettings,
WorkspaceSettings,
},
CloseWindow, CopyPath, CopyRelativePath, NewFile, NewTerminal, OpenInTerminal, OpenTerminal,
OpenVisible, SplitDirection, ToggleFileFinder, ToggleProjectSymbols, ToggleZoom, Workspace,
};
@ -152,6 +155,8 @@ actions!(
SplitUp,
SplitRight,
SplitDown,
SplitHorizontal,
SplitVertical,
TogglePreviewTab,
]
);
@ -2254,6 +2259,23 @@ impl Render for Pane {
}))
.on_action(cx.listener(|pane, _: &SplitLeft, cx| pane.split(SplitDirection::Left, cx)))
.on_action(cx.listener(|pane, _: &SplitUp, cx| pane.split(SplitDirection::Up, cx)))
.on_action(cx.listener(|pane, _: &SplitHorizontal, cx| {
let split_direction =
WorkspaceSettings::get(None, cx).pane_split_direction_horizontal;
match split_direction {
PaneSplitDirectionHorizontal::Down => pane.split(SplitDirection::Down, cx),
_ => pane.split(SplitDirection::Up, cx),
}
}))
.on_action(cx.listener(|pane, _: &SplitVertical, cx| {
let split_direction =
WorkspaceSettings::get(None, cx).pane_split_direction_vertical;
match split_direction {
PaneSplitDirectionVertical::Right => pane.split(SplitDirection::Right, cx),
_ => pane.split(SplitDirection::Left, cx),
}
}))
.on_action(
cx.listener(|pane, _: &SplitRight, cx| pane.split(SplitDirection::Right, cx)),
)