leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(grid): use content_size as size of widget's root node

Browse source
This commit is contained in:
Michael Aaron Murphy 2024-05-29 23:30:03 +02:00 • committed by Michael Murphy
parent 29b52f470f
commit c39fd5103f
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/widget/grid/layout.rs
View file

@ -75,7 +75,7 @@ pub fn resolve<Message>(
match leaf { match leaf {
Ok(leaf) => leafs.push(leaf), Ok(leaf) => leafs.push(leaf),
Err(why) => { Err(why) => {
tracing::error!(%why, "cannot add leaf node to grid"); tracing::error!(?why, "cannot add leaf node to grid");
continue; continue;
} }
} }
@ -134,7 +134,7 @@ pub fn resolve<Message>(
let root = match root { let root = match root {
Ok(root) => root, Ok(root) => root,
Err(why) => { Err(why) => {
tracing::error!(%why, "grid root style invalid"); tracing::error!(?why, "grid root style invalid");
return Node::new(Size::ZERO); return Node::new(Size::ZERO);
} }
}; };
@ -146,14 +146,14 @@ pub fn resolve<Message>(
height: length(max_size.height), height: length(max_size.height),
}, },
) { ) {
tracing::error!(%why, "grid layout did not compute"); tracing::error!(?why, "grid layout did not compute");
return Node::new(Size::ZERO); return Node::new(Size::ZERO);
} }
let grid_layout = match taffy.layout(root) { let grid_layout = match taffy.layout(root) {
Ok(layout) => layout, Ok(layout) => layout,
Err(why) => { Err(why) => {
tracing::error!(%why, "cannot get layout of grid"); tracing::error!(?why, "cannot get layout of grid");
return Node::new(Size::ZERO); return Node::new(Size::ZERO);
} }
}; };
@ -183,8 +183,8 @@ pub fn resolve<Message>(
} }
let grid_size = Size { let grid_size = Size {
width: grid_layout.size.width, width: grid_layout.content_size.width,
height: grid_layout.size.height, height: grid_layout.content_size.height,
}; };
Node::with_children(grid_size.expand(padding), nodes) Node::with_children(grid_size.expand(padding), nodes)