Compare commits
No commits in common. "d2e28b4608dc28b06b2b7247d9abae084222b295" and "444f12cb323f4a169ddde86b3e260f71c957bce6" have entirely different histories.
d2e28b4608
...
444f12cb32
2 changed files with 39 additions and 35 deletions
|
@ -279,10 +279,17 @@ impl Editor {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn scroll_to_cursor(&mut self) {
|
fn scroll_to_cursor(&mut self) {
|
||||||
|
// while self.cursor.line < self.scroll {
|
||||||
|
// self.scroll -= 1;
|
||||||
|
// }
|
||||||
|
// while self.cursor.line > (self.scroll + terminal::size().unwrap().1 as usize - 2) {
|
||||||
|
// self.scroll += 1;
|
||||||
|
// }
|
||||||
|
self.scroll = self.scroll.min(self.cursor.line);
|
||||||
let height = terminal::size().unwrap().1 as usize - 2;
|
let height = terminal::size().unwrap().1 as usize - 2;
|
||||||
self.scroll = self
|
self.scroll = self
|
||||||
.scroll
|
.scroll
|
||||||
.clamp(self.cursor.line.saturating_sub(height), self.cursor.line);
|
.max(self.scroll + self.cursor.line.saturating_sub(self.scroll + height));
|
||||||
}
|
}
|
||||||
|
|
||||||
fn move_home(&mut self) {
|
fn move_home(&mut self) {
|
||||||
|
|
65
src/main.rs
65
src/main.rs
|
@ -167,44 +167,41 @@ impl Navigator {
|
||||||
fn enter(&mut self) {
|
fn enter(&mut self) {
|
||||||
if self.selected < self.editors.len() {
|
if self.selected < self.editors.len() {
|
||||||
self.editors[self.selected].enter();
|
self.editors[self.selected].enter();
|
||||||
return;
|
} else {
|
||||||
}
|
let i = self.selected - self.editors.len();
|
||||||
|
if i == 0 {
|
||||||
let i = self.selected - self.editors.len();
|
if let Some(parent) = self.path.parent() {
|
||||||
// top entry is hardcoded to be ../
|
self.set_path(self.path.join(parent));
|
||||||
if i == 0 {
|
|
||||||
if let Some(parent) = self.path.parent() {
|
|
||||||
self.set_path(self.path.join(parent));
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
let path = &self.files[i];
|
|
||||||
if path.is_dir() {
|
|
||||||
self.set_path(self.path.join(path));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if path.is_file() {
|
|
||||||
let path = path.canonicalize().unwrap();
|
|
||||||
let mut selected = self.editors.len();
|
|
||||||
for (i, editor) in self.editors.iter().enumerate() {
|
|
||||||
if editor.path() == Some(&path) {
|
|
||||||
selected = i;
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
// no editor exists with this path
|
let path = &self.files[i];
|
||||||
if selected == self.editors.len() {
|
if path.is_dir() {
|
||||||
match Editor::open_file(self.clipboard.clone(), path) {
|
self.set_path(self.path.join(path));
|
||||||
Ok(editor) => self.editors.push(editor),
|
} else if path.is_file() {
|
||||||
Err(err) => {
|
let path = path.canonicalize().unwrap();
|
||||||
self.message(format!("Could not open file: {err}"));
|
let mut editor_index = self.editors.len();
|
||||||
return;
|
for (i, editor) in self.editors.iter().enumerate() {
|
||||||
|
if editor.path() == Some(&path) {
|
||||||
|
editor_index = i;
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
if editor_index == self.editors.len() {
|
||||||
|
match Editor::open_file(
|
||||||
|
self.clipboard.clone(),
|
||||||
|
path.canonicalize().unwrap(),
|
||||||
|
) {
|
||||||
|
Ok(editor) => self.editors.push(editor),
|
||||||
|
Err(err) => {
|
||||||
|
self.message(format!("Could not open file: {err}"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
self.selected = editor_index;
|
||||||
|
self.open_selected();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
self.selected = selected;
|
|
||||||
self.open_selected();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue