Garmelon/toss
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Join panicking in some situations

Browse source
This commit is contained in:
Joscha 2023-04-28 14:40:37 +02:00
parent f414db40d5
commit 8bfb4b2dc3
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/widgets/float.rs
View file

@ -86,7 +86,7 @@ impl<I> Float<I> {
let mut inner_pos = Pos::ZERO; let mut inner_pos = Pos::ZERO;
if let Some(horizontal) = self.horizontal { if let Some(horizontal) = self.horizontal {
let available = (size.width - inner_size.width) as f32; let available = size.width.saturating_sub(inner_size.width) as f32;
// Biased towards the left if horizontal lands exactly on the // Biased towards the left if horizontal lands exactly on the
// boundary between two cells // boundary between two cells
inner_pos.x = (horizontal * available).floor().min(available) as i32; inner_pos.x = (horizontal * available).floor().min(available) as i32;
@ -96,7 +96,7 @@ impl<I> Float<I> {
} }
if let Some(vertical) = self.vertical { if let Some(vertical) = self.vertical {
let available = (size.height - inner_size.height) as f32; let available = size.height.saturating_sub(inner_size.height) as f32;
// Biased towards the top if vertical lands exactly on the boundary // Biased towards the top if vertical lands exactly on the boundary
// between two cells // between two cells
inner_pos.y = (vertical * available).floor().min(available) as i32; inner_pos.y = (vertical * available).floor().min(available) as i32;