DeCarabas/fwd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Simplify centering math, don't crash if the rectangle clips

Browse source 
Also, tests
This commit is contained in:
John Doty 2023-03-21 23:07:08 -07:00
parent 290dcff9b6
commit 34340e2575
1 changed files with 43 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

71
src/client/ui.rs
View file

@ -582,36 +582,24 @@ impl Drop for UI {
/// helper function to create a centered rect using up certain percentage of the available rect `r` /// helper function to create a centered rect using up certain percentage of the available rect `r`
fn centered_rect(width_chars: u16, height_chars: u16, r: Rect) -> Rect { fn centered_rect(width_chars: u16, height_chars: u16, r: Rect) -> Rect {
let height_percent = let left = r.left()
(height_chars as f64 / r.height as f64 * 100.0).ceil() as u16; + if width_chars > r.width {
let height_diff = (100 - height_percent) / 2; 0
let popup_layout = Layout::default() } else {
.direction(Direction::Vertical) (r.width - width_chars) / 2
.constraints( };
[
Constraint::Percentage(height_diff),
Constraint::Percentage(height_percent),
Constraint::Percentage(height_diff),
]
.as_ref(),
)
.split(r);
let width_percent = let top = r.top()
(width_chars as f64 / r.width as f64 * 100.0).ceil() as u16; + if height_chars > r.height {
let width_diff = (100 - width_percent) / 2; 0
} else {
(r.height - height_chars) / 2
};
Layout::default() let width = width_chars.min(r.width);
.direction(Direction::Horizontal) let height = height_chars.min(r.height);
.constraints(
[ Rect::new(left, top, width, height)
Constraint::Percentage(width_diff),
Constraint::Percentage(width_percent),
Constraint::Percentage(width_diff),
]
.as_ref(),
)
.split(popup_layout[1])[1]
} }
#[cfg(test)] #[cfg(test)]
@ -777,4 +765,31 @@ mod tests {
drop(sender); drop(sender);
} }
#[test]
fn test_centered_rect() {
// Normal old centering.
let frame = Rect::new(0, 0, 128, 128);
let centered = centered_rect(10, 10, frame);
assert_eq!(centered.left(), (128 - centered.width) / 2);
assert_eq!(centered.top(), (128 - centered.height) / 2);
assert_eq!(centered.width, 10);
assert_eq!(centered.height, 10);
// Clip the width and height to the box
let frame = Rect::new(0, 0, 5, 5);
let centered = centered_rect(10, 10, frame);
assert_eq!(centered.left(), 0);
assert_eq!(centered.top(), 0);
assert_eq!(centered.width, 5);
assert_eq!(centered.height, 5);
// Deal with non zero-zero origins.
let frame = Rect::new(10, 10, 128, 128);
let centered = centered_rect(10, 10, frame);
assert_eq!(centered.left(), 10 + (128 - centered.width) / 2);
assert_eq!(centered.top(), 10 + (128 - centered.height) / 2);
assert_eq!(centered.width, 10);
assert_eq!(centered.height, 10);
}
} }