Skip to content

Commit 6de2ffd

Browse files
committed
Use saturated_sub where possible
1 parent 63e455a commit 6de2ffd

File tree

1 file changed

+5
-24
lines changed

1 file changed

+5
-24
lines changed

src/view/render_slice.rs

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,7 @@ impl RenderSlice {
130130
return 0;
131131
}
132132

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

140135
if view_height <= 1 || view_height > self.lines_count {
141136
return 0;
@@ -285,12 +280,8 @@ impl RenderSlice {
285280
else {
286281
// trailing lines have precedence over leading lines, title always has precedence
287282
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+
294285
let leading_lines_end = if leading_lines_length < available_height {
295286
leading_lines_length
296287
}
@@ -310,12 +301,7 @@ impl RenderSlice {
310301
else {
311302
// title always has precedence
312303
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);
319305

320306
let trailing_lines_end = if trailing_lines_length < available_height {
321307
trailing_lines_length
@@ -335,12 +321,7 @@ impl RenderSlice {
335321
}
336322
else {
337323
// 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);
344325

345326
let lines_start = self.scroll_position.get_top_position();
346327

0 commit comments

Comments
 (0)