@@ -130,12 +130,7 @@ impl RenderSlice {
130
130
return 0 ;
131
131
}
132
132
133
- let view_height = if self . padding_height < self . height {
134
- self . height - self . padding_height
135
- }
136
- else {
137
- 0
138
- } ;
133
+ let view_height = self . height . saturating_sub ( self . padding_height ) ;
139
134
140
135
if view_height <= 1 || view_height > self . lines_count {
141
136
return 0 ;
@@ -285,12 +280,8 @@ impl RenderSlice {
285
280
else {
286
281
// trailing lines have precedence over leading lines, title always has precedence
287
282
let padding_height = if self . show_title { 1 } else { 0 } + trailing_lines_length;
288
- let available_height = if padding_height < self . height {
289
- self . height - padding_height
290
- }
291
- else {
292
- 0
293
- } ;
283
+ let available_height = self . height . saturating_sub ( padding_height) ;
284
+
294
285
let leading_lines_end = if leading_lines_length < available_height {
295
286
leading_lines_length
296
287
}
@@ -310,12 +301,7 @@ impl RenderSlice {
310
301
else {
311
302
// title always has precedence
312
303
let padding_height = if self . show_title { 1 } else { 0 } ;
313
- let available_height = if padding_height < self . height {
314
- self . height - padding_height
315
- }
316
- else {
317
- 0
318
- } ;
304
+ let available_height = self . height . saturating_sub ( padding_height) ;
319
305
320
306
let trailing_lines_end = if trailing_lines_length < available_height {
321
307
trailing_lines_length
@@ -335,12 +321,7 @@ impl RenderSlice {
335
321
}
336
322
else {
337
323
// all other lines take precedence over regular lines
338
- let available_height = if self . padding_height < self . height {
339
- self . height - self . padding_height
340
- }
341
- else {
342
- 0
343
- } ;
324
+ let available_height = self . height . saturating_sub ( self . padding_height ) ;
344
325
345
326
let lines_start = self . scroll_position . get_top_position ( ) ;
346
327
0 commit comments