mirror of https://github.com/wayvr-org/wayvr.git
wgui: layout: fix `resize_to_parent`
This commit is contained in:
parent
3dff9c5882
commit
5efbdce8f0
|
|
@ -396,6 +396,12 @@ impl Layout {
|
||||||
globals,
|
globals,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let size = if params.resize_to_parent {
|
||||||
|
taffy::Size::percent(1.0)
|
||||||
|
} else {
|
||||||
|
taffy::Size::auto()
|
||||||
|
};
|
||||||
|
|
||||||
let (tree_root_widget, tree_root_node) = add_child_internal(
|
let (tree_root_widget, tree_root_node) = add_child_internal(
|
||||||
&mut state.tree,
|
&mut state.tree,
|
||||||
&mut state.widgets,
|
&mut state.widgets,
|
||||||
|
|
@ -403,11 +409,7 @@ impl Layout {
|
||||||
None, // no parent
|
None, // no parent
|
||||||
WidgetDiv::create(),
|
WidgetDiv::create(),
|
||||||
taffy::Style {
|
taffy::Style {
|
||||||
size: if params.resize_to_parent {
|
size,
|
||||||
taffy::Size::percent(1.0)
|
|
||||||
} else {
|
|
||||||
taffy::Size::auto()
|
|
||||||
},
|
|
||||||
..Default::default()
|
..Default::default()
|
||||||
},
|
},
|
||||||
)?;
|
)?;
|
||||||
|
|
@ -418,7 +420,10 @@ impl Layout {
|
||||||
&mut state.nodes,
|
&mut state.nodes,
|
||||||
Some(tree_root_node),
|
Some(tree_root_node),
|
||||||
WidgetDiv::create(),
|
WidgetDiv::create(),
|
||||||
taffy::Style::default(),
|
taffy::Style {
|
||||||
|
size,
|
||||||
|
..Default::default()
|
||||||
|
},
|
||||||
)?;
|
)?;
|
||||||
|
|
||||||
Ok(Self {
|
Ok(Self {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue