andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 17:36:19 +04:00
Code Issues Projects Releases Wiki Activity

Correct the naming issue with vsplit and hsplit being swapped.

Browse Source
This commit is contained in:
Blaž Hrastnik 2021-04-08 15:52:04 +09:00
parent 58c5fec592
commit 8b33ba2284
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
helix-term/src/application.rs
View File

@ -52,10 +52,10 @@ pub fn new(mut args: Args, executor: &'static smol::Executor<'static>) -> Result
if let Ok(files) = args.values_of_t::<PathBuf>("files") {
for file in files {
editor.open(file, Action::HorizontalSplit)?;
editor.open(file, Action::VerticalSplit)?;
}
} else {
editor.new_file(Action::HorizontalSplit)?;
editor.new_file(Action::VerticalSplit)?;
}
compositor.push(Box::new(ui::EditorView::new()));

2
helix-term/src/commands.rs
View File

@ -1854,7 +1854,7 @@ pub fn vsplit(cx: &mut Context) {
if let Some(path) = path {
// open the same file again. this will vsplit
cx.editor
.open(path, helix_view::editor::Action::HorizontalSplit);
.open(path, helix_view::editor::Action::VerticalSplit);
}
}

4
helix-term/src/ui/picker.rs
View File

@ -168,7 +168,7 @@ fn handle_event(&mut self, event: Event, cx: &mut Context) -> EventResult {
modifiers: KeyModifiers::CONTROL,
} => {
if let Some(option) = self.selection() {
(self.callback_fn)(&mut cx.editor, option, Action::VerticalSplit);
(self.callback_fn)(&mut cx.editor, option, Action::HorizontalSplit);
}
return close_fn;
}
@ -177,7 +177,7 @@ fn handle_event(&mut self, event: Event, cx: &mut Context) -> EventResult {
modifiers: KeyModifiers::CONTROL,
} => {
if let Some(option) = self.selection() {
(self.callback_fn)(&mut cx.editor, option, Action::HorizontalSplit);
(self.callback_fn)(&mut cx.editor, option, Action::VerticalSplit);
}
return close_fn;
}

8
helix-view/src/tree.rs
View File

@ -70,13 +70,13 @@ pub fn new(layout: Layout) -> Self {
impl Default for Container {
fn default() -> Self {
Self::new(Layout::Horizontal)
Self::new(Layout::Vertical)
}
}
impl Tree {
pub fn new(area: Rect) -> Self {
let root = Node::container(Layout::Horizontal);
let root = Node::container(Layout::Vertical);
let mut nodes = HopSlotMap::with_key();
let root = nodes.insert(root);
@ -322,7 +322,7 @@ pub fn recalculate(&mut self) {
container.area = area;
match container.layout {
Layout::Vertical => {
Layout::Horizontal => {
let len = container.children.len();
let height = area.height / len as u16;
@ -347,7 +347,7 @@ pub fn recalculate(&mut self) {
self.stack.push((*child, area));
}
}
Layout::Horizontal => {
Layout::Vertical => {
let len = container.children.len();
let width = area.width / len as u16;