diff options
| author |  Héctor Ramón Jiménez <hector@hecrj.dev> | 2024-01-05 17:46:33 +0100 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector@hecrj.dev> | 2024-01-10 10:01:49 +0100 |
| commit | d278bfd21d0399009e652560afb9a4d185e92637 (patch) | |
| tree | 7ae77df9ff80f1ccd82935c2d442633ff6b96789 /core/src/layout | |
| parent | 22226394f7b1a0e0205b9bb5b3ef9b85a3b406f5 (diff) | |
| download | iced-d278bfd21d0399009e652560afb9a4d185e92637.tar.gz iced-d278bfd21d0399009e652560afb9a4d185e92637.tar.bz2 iced-d278bfd21d0399009e652560afb9a4d185e92637.zip | |
Replace `width` and `height` with `Widget::size`
Diffstat (limited to 'core/src/layout')
| -rw-r--r-- | core/src/layout/flex.rs | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/core/src/layout/flex.rs b/core/src/layout/flex.rs index 67cc7f2a..036b31fd 100644 --- a/core/src/layout/flex.rs +++ b/core/src/layout/flex.rs @@ -86,10 +86,11 @@ where nodes.resize(items.len(), Node::default()); for (i, (child, tree)) in items.iter().zip(trees.iter_mut()).enumerate() { - let (fill_main_factor, fill_cross_factor) = axis.pack( - child.as_widget().width().fill_factor(), - child.as_widget().height().fill_factor(), - ); + let (fill_main_factor, fill_cross_factor) = { + let size = child.as_widget().size(); + + axis.pack(size.width.fill_factor(), size.height.fill_factor()) + }; if fill_main_factor == 0 { if fill_cross_factor == 0 { @@ -124,10 +125,11 @@ where }; for (i, (child, tree)) in items.iter().zip(trees.iter_mut()).enumerate() { - let (fill_main_factor, fill_cross_factor) = axis.pack( - child.as_widget().width().fill_factor(), - child.as_widget().height().fill_factor(), - ); + let (fill_main_factor, fill_cross_factor) = { + let size = child.as_widget().size(); + + axis.pack(size.width.fill_factor(), size.height.fill_factor()) + }; if fill_main_factor == 0 && fill_cross_factor != 0 { let (max_width, max_height) = axis.pack(available, intrinsic_cross); @@ -157,10 +159,11 @@ where }; for (i, (child, tree)) in items.iter().zip(trees).enumerate() { - let (fill_main_factor, fill_cross_factor) = axis.pack( - child.as_widget().width().fill_factor(), - child.as_widget().height().fill_factor(), - ); + let (fill_main_factor, fill_cross_factor) = { + let size = child.as_widget().size(); + + axis.pack(size.width.fill_factor(), size.height.fill_factor()) + }; if fill_main_factor != 0 { let max_main = if fill_main_factor == 0 { |