@@ -13,7 +13,7 @@ use crate::view::View;
1313/// state (usually by creating and applying a transaction).
1414pub type Command = fn(view: &mut View, count: usize);
1515
16−const PADDING: u16 = 10;
16+const PADDING: u16 = 5;
1717
1818pub fn move_char_left(view: &mut View, count: usize) {
1919 // TODO: use a transaction
@@ -138,10 +138,9 @@ pub fn move_file_end(view: &mut View, _count: usize) {
138138pub fn check_cursor_in_view(view: &mut View) -> bool {
139139 let cursor = view.state.selection().cursor();
140140 let line = view.state.doc().char_to_line(cursor) as u16;
141− let document_end = view.first_line + view.size.1.saturating_sub(2);
142− let padding = 5u16;
141+ let document_end = view.first_line + view.size.1.saturating_sub(1);
143142
144− if (line > document_end.saturating_sub(padding)) | (line < view.first_line + padding) {
143+ if (line > document_end.saturating_sub(PADDING)) | (line < view.first_line + PADDING) {
145144 return false;
146145 }
147146 true
@@ -150,9 +149,13 @@ pub fn check_cursor_in_view(view: &mut View) -> bool {
150149pub fn page_up(view: &mut View, _count: usize) {
151150 let text = &view.state.doc;
152151 view.first_line = view.first_line.saturating_sub(view.size.1);
153− let pos = text.line_to_char(view.first_line as usize);
152+ let pos = text.line_to_char(view.last_line() as usize);
154153
155− view.state.selection = Selection::single(pos, pos);
154+ if !check_cursor_in_view(view) {
155+ let text = &view.state.doc;
156+ let pos = text.line_to_char(view.last_line().saturating_sub(PADDING as usize));
157+ view.state.selection = Selection::single(pos, pos);
158+ }
156159}
157160
158161pub fn page_down(view: &mut View, _count: usize) {
@@ -168,13 +171,14 @@ pub fn half_page_up(view: &mut View, _count: usize) {
168171 view.first_line = view.first_line.saturating_sub(view.size.1 / 2);
169172 if !check_cursor_in_view(view) {
170173 let text = &view.state.doc;
171− let pos = text.line_to_char(view.first_line as usize);
174+ let pos = text.line_to_char(view.last_line() - PADDING as usize);
172175 view.state.selection = Selection::single(pos, pos);
173176 }
174177}
175178
176179pub fn half_page_down(view: &mut View, _count: usize) {
177− if view.first_line < view.state.doc().len_lines() as u16 - view.size.1 {
180+ let lines = view.state.doc().len_lines();
181+ if view.first_line < lines.saturating_sub(view.size.1 as usize) as u16 {
178182 view.first_line += view.size.1 / 2;
179183 }
180184 if !check_cursor_in_view(view) {