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

fixed page up/down

Browse Source
This commit is contained in:
Jan Hrastnik 2020-10-05 17:58:16 +02:00
parent 1035b2aea1
commit 88f93399fd
2 changed files with 51 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
helix-view/src/commands.rs
View File

@ -133,22 +133,60 @@ pub fn move_file_end(view: &mut View, _count: usize) {
view.state.mode = Mode::Normal;
}
pub fn check_cursor_in_view(view: &mut View) -> bool {
let cursor = view.state.selection().cursor();
let line = view.state.doc().char_to_line(cursor) as u16;
let document_end = view.first_line + view.size.1.saturating_sub(1) - 1;
let padding = 5u16;
if (line > document_end.saturating_sub(padding)) | (line < view.first_line + padding) {
return false;
}
true
}
pub fn page_up(view: &mut View, _count: usize) {
let text = &view.state.doc;
view.first_line = view.first_line.saturating_sub(view.size.1);
view.state.selection = Selection::single(view.first_line as usize, view.first_line as usize);
view.state.selection = Selection::single(
text.line_to_char(view.first_line as usize),
text.line_to_char(view.first_line as usize),
);
}
pub fn page_down(view: &mut View, _count: usize) {
let text = &view.state.doc;
view.first_line += view.size.1;
view.state.selection = Selection::single(view.first_line as usize, view.first_line as usize);
view.state.selection = Selection::single(
text.line_to_char(view.first_line as usize),
text.line_to_char(view.first_line as usize),
);
}
pub fn half_page_up(view: &mut View, _count: usize) {
view.first_line = view.first_line.saturating_sub(view.size.1 / 2);
if !check_cursor_in_view(view) {
let text = &view.state.doc;
view.state.selection = Selection::single(
text.line_to_char(view.first_line as usize),
text.line_to_char(view.first_line as usize),
);
}
}
pub fn half_page_down(view: &mut View, _count: usize) {
view.first_line += view.size.1 / 2;
if !check_cursor_in_view(view) {
let text = &view.state.doc;
view.state.selection = Selection::single(
text.line_to_char(view.first_line as usize),
text.line_to_char(view.first_line as usize),
);
}
}
// avoid select by default by having a visual mode switch that makes movements into selects

13
helix-view/src/keymap.rs
View File

@ -108,6 +108,15 @@ macro_rules! shift {
};
}
macro_rules! ctrl {
($ch:expr) => {
Key {
code: KeyCode::Char($ch),
modifiers: Modifiers::CONTROL,
}
};
}
pub fn default() -> Keymaps {
hashmap!(
state::Mode::Normal =>
@ -148,8 +157,8 @@ pub fn default() -> Keymaps {
code: KeyCode::PageDown,
modifiers: Modifiers::NONE
}] => commands::page_down,
vec![shift!('u')] => commands::half_page_up,
vec![shift!('d')] => commands::half_page_down,
vec![ctrl!('u')] => commands::half_page_up,
vec![ctrl!('d')] => commands::half_page_down,
),
state::Mode::Insert => hashmap!(
vec![Key {