suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correct the naming issue with vsplit and hsplit being swapped.

pull/11/head
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 @@ impl Application {
if let Ok(files) = args.values_of_t::<PathBuf>("files") { if let Ok(files) = args.values_of_t::<PathBuf>("files") {
for file in files { for file in files {
editor.open(file, Action::HorizontalSplit)?; editor.open(file, Action::VerticalSplit)?;
} }
} else { } else {
editor.new_file(Action::HorizontalSplit)?; editor.new_file(Action::VerticalSplit)?;
} }
compositor.push(Box::new(ui::EditorView::new())); 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 { if let Some(path) = path {
// open the same file again. this will vsplit // open the same file again. this will vsplit
cx.editor 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 @@ impl<T: 'static> Component for Picker<T> {
modifiers: KeyModifiers::CONTROL, modifiers: KeyModifiers::CONTROL,
} => { } => {
if let Some(option) = self.selection() { 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; return close_fn;
} }
@ -177,7 +177,7 @@ impl<T: 'static> Component for Picker<T> {
modifiers: KeyModifiers::CONTROL, modifiers: KeyModifiers::CONTROL,
} => { } => {
if let Some(option) = self.selection() { 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; return close_fn;
} }

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

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