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

Fix Float sizing for unset directions

Browse source
This commit is contained in:
Joscha 2023-02-17 00:15:46 +01:00
parent 845d88c93f
commit 5a15838989
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/widgets/float.rs
View file

@ -32,9 +32,6 @@ impl<I> Float<I> {
} }
fn push_inner(&self, frame: &mut Frame, size: Size, mut inner_size: Size) { fn push_inner(&self, frame: &mut Frame, size: Size, mut inner_size: Size) {
inner_size.width = inner_size.width.min(size.width);
inner_size.height = inner_size.height.min(size.height);
let mut inner_pos = Pos::ZERO; let mut inner_pos = Pos::ZERO;
if let Some(horizontal) = self.horizontal { if let Some(horizontal) = self.horizontal {
@ -42,6 +39,9 @@ impl<I> Float<I> {
// 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;
inner_size.width = inner_size.width.min(size.width);
} else {
inner_size.width = size.width;
} }
if let Some(vertical) = self.vertical { if let Some(vertical) = self.vertical {
@ -49,6 +49,9 @@ impl<I> Float<I> {
// 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;
inner_size.height = inner_size.height.min(size.height);
} else {
inner_size.height = size.height;
} }
frame.push(inner_pos, inner_size); frame.push(inner_pos, inner_size);