61ef0a4 · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

Fix scrolling calculations.

61ef0a4Blaž Hrastnik6 years ago

helix-view/src/commands.rs+12−8

compare with master

unifiedsplit

@@ -13,7 +13,7 @@ use crate::view::View;

13/// state (usually by creating and applying a transaction).

14pub type Command = fn(view: &mut View, count: usize);

16−const PADDING: u16 = 10;

16+const PADDING: u16 = 5;

18pub fn move_char_left(view: &mut View, count: usize) {

19 // TODO: use a transaction

@@ -138,10 +138,9 @@ pub fn move_file_end(view: &mut View, _count: usize) {

138pub fn check_cursor_in_view(view: &mut View) -> bool {

139 let cursor = view.state.selection().cursor();

140 let line = view.state.doc().char_to_line(cursor) as u16;

141− let document_end = view.first_line + view.size.1.saturating_sub(2);

141+ let document_end = view.first_line + view.size.1.saturating_sub(1);

142− let padding = 5u16;

143

142

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) {

145 return false;

144 return false;

146 }

145 }

147 true

146 true

@@ -150,9 +149,13 @@ pub fn check_cursor_in_view(view: &mut View) -> bool {

150pub fn page_up(view: &mut View, _count: usize) {

149pub fn page_up(view: &mut View, _count: usize) {

151 let text = &view.state.doc;

150 let text = &view.state.doc;

152 view.first_line = view.first_line.saturating_sub(view.size.1);

151 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);

154

153

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));

155− view.state.selection = Selection::single(pos, pos);

157+ view.state.selection = Selection::single(pos, pos);

158+ }

156}

159}

157

160

158pub fn page_down(view: &mut View, _count: usize) {

161pub fn page_down(view: &mut View, _count: usize) {

@@ -168,13 +171,14 @@ pub fn half_page_up(view: &mut View, _count: usize) {

168 view.first_line = view.first_line.saturating_sub(view.size.1 / 2);

171 view.first_line = view.first_line.saturating_sub(view.size.1 / 2);

169 if !check_cursor_in_view(view) {

172 if !check_cursor_in_view(view) {

170 let text = &view.state.doc;

173 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);

172 view.state.selection = Selection::single(pos, pos);

175 view.state.selection = Selection::single(pos, pos);

173 }

176 }

174}

177}

175

178

176pub fn half_page_down(view: &mut View, _count: usize) {

179pub 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 {

178 view.first_line += view.size.1 / 2;

182 view.first_line += view.size.1 / 2;

179 }

183 }

180 if !check_cursor_in_view(view) {

184 if !check_cursor_in_view(view) {

helix-view/src/view.rs+1−1

@@ -34,7 +34,7 @@ impl View {

34 pub fn ensure_cursor_in_view(&mut self) {

35 let cursor = self.state.selection().cursor();

36 let line = self.state.doc().char_to_line(cursor) as u16;

37− let document_end = self.first_line + self.size.1.saturating_sub(2);

37+ let document_end = self.first_line + self.size.1.saturating_sub(1);

39 let padding = 5u16;