bobwen-dev
/
hunter
mirror of https://github.com/bobwen-dev/hunter
1
0
Fork 0
Code Issues Releases Wiki Activity

fix messed up manual merge in hbox

This commit is contained in:
rabite 2019-07-08 17:22:55 +02:00
parent 19be163b3c
commit c4ddf17bff
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/hbox.rs
View File

@ -123,22 +123,16 @@ impl<T> HBox<T> where T: Widget + PartialEq {
let len = coords.len(); let len = coords.len();
let gap = if len == ratios.len() { 0 } else { 1 }; let gap = if len == ratios.len() { 0 } else { 1 };
let prev_coords = coords.last(); let widget_xsize = *ratio as u16;
let prev_xsize = prev_coords.map(|c| c.xsize());
let prev_xpos = prev_coords.map(|c| c.xpos());
let widget_xsize = box_xsize * *ratio as u16 / 100;
let widget_xpos = if len == 0 { let widget_xpos = if len == 0 {
box_coords.top().x() box_coords.top().x()
} else { } else {
prev_xsize.unwrap() + prev_xpos.unwrap() + gap let prev_coords = coords.last().unwrap();
}; let prev_xsize = prev_coords.xsize();
let prev_xpos = prev_coords.position().x();
// Ensure that last widget isn't under/over sized due to gap/rounding prev_xsize + prev_xpos + gap
let widget_xsize = if len+1 == ratios.len() && len != 0 { };
box_xsize - (prev_xpos.unwrap() + prev_xsize.unwrap())
} else { widget_xsize };
coords.push(Coordinates { coords.push(Coordinates {
size: Size((widget_xsize, size: Size((widget_xsize,