From 7f07e6676801be72e5a58b5612893c7d16f94a64 Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Tue, 6 Oct 2020 17:32:30 +0900
Subject: Cleanup: track first_line as usize.

---
 helix-view/src/view.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'helix-view/src/view.rs')

diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs
index 6ef5ee6f..887c45a2 100644
--- a/helix-view/src/view.rs
+++ b/helix-view/src/view.rs
@@ -11,7 +11,7 @@ use tui::layout::Rect;
 
 pub struct View {
     pub state: State,
-    pub first_line: u16,
+    pub first_line: usize,
     pub size: (u16, u16),
     pub theme: Theme, // TODO: share one instance
 }
@@ -33,10 +33,10 @@ impl View {
 
     pub fn ensure_cursor_in_view(&mut self) {
         let cursor = self.state.selection().cursor();
-        let line = self.state.doc().char_to_line(cursor) as u16;
-        let document_end = self.first_line + self.size.1.saturating_sub(1);
+        let line = self.state.doc().char_to_line(cursor);
+        let document_end = self.first_line + (self.size.1 as usize).saturating_sub(1);
 
-        let padding = 5u16;
+        let padding = 5usize;
 
         // TODO: side scroll
 
@@ -54,7 +54,7 @@ impl View {
     pub fn last_line(&self) -> usize {
         let viewport = Rect::new(6, 0, self.size.0, self.size.1 - 1); // - 1 for statusline
         std::cmp::min(
-            (self.first_line + viewport.height) as usize,
+            self.first_line + (viewport.height as usize),
             self.state.doc().len_lines() - 1,
         )
     }
-- 
cgit v1.2.3-70-g09d2