File tree Expand file tree Collapse file tree 5 files changed +10
-9
lines changed
Expand file tree Collapse file tree 5 files changed +10
-9
lines changed Original file line number Diff line number Diff line change @@ -402,7 +402,7 @@ impl BranchListComponent {
402402 for ( i, displaybranch) in self
403403 . branches
404404 . iter ( )
405- . skip ( self . scroll . get ( ) )
405+ . skip ( self . scroll . get_top ( ) )
406406 . take ( height)
407407 . enumerate ( )
408408 {
@@ -430,8 +430,9 @@ impl BranchListComponent {
430430 branch_name += THREE_DOTS ;
431431 }
432432
433- let selected =
434- ( self . selection as usize - self . scroll . get ( ) ) == i;
433+ let selected = ( self . selection as usize
434+ - self . scroll . get_top ( ) )
435+ == i;
435436
436437 let is_head = displaybranch
437438 . local_details ( )
Original file line number Diff line number Diff line change @@ -140,7 +140,7 @@ impl DetailsComponent {
140140 . concat ( )
141141 . iter ( )
142142 . enumerate ( )
143- . skip ( self . scroll . get ( ) )
143+ . skip ( self . scroll . get_top ( ) )
144144 . take ( height)
145145 . map ( |( i, line) | {
146146 Spans :: from ( vec ! [ Span :: styled(
Original file line number Diff line number Diff line change @@ -337,7 +337,7 @@ impl DiffComponent {
337337 Span :: raw( Cow :: from( ")" ) ) ,
338338 ] ) ] ) ;
339339 } else {
340- let min = self . scroll . get ( ) ;
340+ let min = self . scroll . get_top ( ) ;
341341 let max = min + height as usize ;
342342
343343 let mut line_cursor = 0_usize ;
Original file line number Diff line number Diff line change @@ -182,7 +182,7 @@ impl RevisionFilesComponent {
182182
183183 let items = self
184184 . tree
185- . iterate ( self . scroll . get ( ) , tree_height)
185+ . iterate ( self . scroll . get_top ( ) , tree_height)
186186 . map ( |( item, selected) | {
187187 Self :: tree_item_to_span ( item, & self . theme , selected)
188188 } ) ;
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ impl VerticalScroll {
2020 }
2121 }
2222
23- pub fn get ( & self ) -> usize {
23+ pub fn get_top ( & self ) -> usize {
2424 self . top . get ( )
2525 }
2626
@@ -58,7 +58,7 @@ impl VerticalScroll {
5858 visual_height : usize ,
5959 ) -> usize {
6060 let new_top = calc_scroll_top (
61- self . get ( ) ,
61+ self . get_top ( ) ,
6262 visual_height,
6363 selection,
6464 selection_max,
@@ -76,7 +76,7 @@ impl VerticalScroll {
7676 line_count : usize ,
7777 visual_height : usize ,
7878 ) -> usize {
79- self . update ( self . get ( ) , line_count, visual_height)
79+ self . update ( self . get_top ( ) , line_count, visual_height)
8080 }
8181
8282 pub fn draw < B : Backend > (
You can’t perform that action at this time.
0 commit comments