on master help sign in
Fix lacking space panic (#6109)
def2696nuid32
helix-term/src/ui/markdown.rs+1−4
@@ -342,13 +342,10 @@ impl Component for Markdown {
342
342
343 fn required_size(&mut self, viewport: (u16, u16)) -> Option<(u16, u16)> {
343 fn required_size(&mut self, viewport: (u16, u16)) -> Option<(u16, u16)> {
344 let padding = 2;
344 let padding = 2;
345− if padding >= viewport.1 || padding >= viewport.0 {
346− return None;
347− }
348 let contents = self.parse(None);
345 let contents = self.parse(None);
349
346
350 // TODO: account for tab width
347 // TODO: account for tab width
351− let max_text_width = (viewport.0 - padding).min(120);
348+ let max_text_width = (viewport.0.saturating_sub(padding)).min(120);
352 let (width, height) = crate::ui::text::required_size(&contents, max_text_width);
349 let (width, height) = crate::ui::text::required_size(&contents, max_text_width);
353
350
354 Some((width + padding, height + padding))
351 Some((width + padding, height + padding))
helix-view/src/graphics.rs+2−2
@@ -237,8 +237,8 @@ impl Rect {
237 Rect {
237 Rect {
238 x: x1,
238 x: x1,
239 y: y1,
239 y: y1,
240− width: x2 - x1,
240+ width: x2.saturating_sub(x1),
241− height: y2 - y1,
241+ height: y2.saturating_sub(y1),
242 }
242 }
243 }
243 }
244
244