diff options
author | Blaž Hrastnik | 2021-04-08 06:52:04 +0000 |
---|---|---|
committer | Blaž Hrastnik | 2021-04-08 06:52:04 +0000 |
commit | 8b33ba2284f88bea4c6144364d75189255466661 (patch) | |
tree | ae826a57cbbb2134b5375e2c976c59eebcef856d | |
parent | 58c5fec592a825bed0b829cd0f46030c09cb0a11 (diff) |
Correct the naming issue with vsplit and hsplit being swapped.
-rw-r--r-- | helix-term/src/application.rs | 4 | ||||
-rw-r--r-- | helix-term/src/commands.rs | 2 | ||||
-rw-r--r-- | helix-term/src/ui/picker.rs | 4 | ||||
-rw-r--r-- | helix-view/src/tree.rs | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs index 396bd565..71c6fba1 100644 --- a/helix-term/src/application.rs +++ b/helix-term/src/application.rs @@ -52,10 +52,10 @@ impl Application { 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())); diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index 43dd55b1..2e205fa6 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -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); } } diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs index ef2fe2a8..39580f66 100644 --- a/helix-term/src/ui/picker.rs +++ b/helix-term/src/ui/picker.rs @@ -168,7 +168,7 @@ impl<T: 'static> Component for Picker<T> { 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 @@ impl<T: 'static> Component for Picker<T> { 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; } diff --git a/helix-view/src/tree.rs b/helix-view/src/tree.rs index 5fed2d5a..6204ba41 100644 --- a/helix-view/src/tree.rs +++ b/helix-view/src/tree.rs @@ -70,13 +70,13 @@ impl Container { 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 @@ impl Tree { 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 @@ impl Tree { self.stack.push((*child, area)); } } - Layout::Horizontal => { + Layout::Vertical => { let len = container.children.len(); let width = area.width / len as u16; |