voxel/hUI
voxel/hUI
1
1
Fork 0
mirror of https://github.com/griffi-gh/hUI.git synced 2024-11-21 14:48:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

this should fix the gap thing?

Browse source
This commit is contained in:
griffi-gh 2024-03-25 14:18:14 +01:00
parent c1be9bf22b
commit d8b470d805
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hui/src/element/builtin/container.rs
View file

@ -225,7 +225,8 @@ impl UiElement for Container {
let last_line = lines.last_mut().unwrap(); let last_line = lines.last_mut().unwrap();
last_line.content_size = line_size; last_line.content_size = line_size;
//HACK: why? - self.gap, may be different for the last element or if it's the only element in the line //HACK: why? - self.gap, may be different for the last element or if it's the only element in the line
last_line.remaining_space = max_line_pri - self.gap - match self.direction { let will_produce_gap = if line_element_count > 1 { self.gap } else { 0. };
last_line.remaining_space = max_line_pri - will_produce_gap - match self.direction {
Direction::Horizontal => line_size.x + self.padding.left + self.padding.right, Direction::Horizontal => line_size.x + self.padding.left + self.padding.right,
Direction::Vertical => line_size.y + self.padding.top + self.padding.bottom, Direction::Vertical => line_size.y + self.padding.top + self.padding.bottom,
}; };
@ -290,7 +291,8 @@ impl UiElement for Container {
//HACK: why? - self.gap, may be different for the last element or if it's the only element in the line //HACK: why? - self.gap, may be different for the last element or if it's the only element in the line
let cur_line = lines.last_mut().unwrap(); let cur_line = lines.last_mut().unwrap();
cur_line.content_size = line_size; cur_line.content_size = line_size;
cur_line.remaining_space = max_line_pri - self.gap - match self.direction { let will_produce_gap = if line_element_count > 1 { self.gap } else { 0. };
cur_line.remaining_space = max_line_pri - will_produce_gap - match self.direction {
Direction::Horizontal => line_size.x + self.padding.left + self.padding.right, Direction::Horizontal => line_size.x + self.padding.left + self.padding.right,
Direction::Vertical => line_size.y + self.padding.top + self.padding.bottom, Direction::Vertical => line_size.y + self.padding.top + self.padding.bottom,
}; };