me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2298 from iced-rs/fix/row-column-fluidity

Browse source 
Fix `Column` and `Row` fluidity being overridden by `push`
This commit is contained in:
Héctor Ramón 2024-02-27 01:37:13 +01:00 • committed by GitHub
commit 8bb1587a74
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 19 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

11
widget/src/column.rs
View file

@ -115,15 +115,10 @@ where
child: impl Into<Element<'a, Message, Theme, Renderer>>,
) -> Self {
let child = child.into();
let size = child.as_widget().size_hint();
let child_size = child.as_widget().size_hint();
if size.width.is_fill() {
self.width = Length::Fill;
}
if size.height.is_fill() {
self.height = Length::Fill;
}
self.width = self.width.enclose(child_size.width);
self.height = self.height.enclose(child_size.height);
self.children.push(child);
self

11
widget/src/keyed/column.rs
View file

@ -110,15 +110,10 @@ where
child: impl Into<Element<'a, Message, Theme, Renderer>>,
) -> Self {
let child = child.into();
let size = child.as_widget().size_hint();
let child_size = child.as_widget().size_hint();
if size.width.is_fill() {
self.width = Length::Fill;
}
if size.height.is_fill() {
self.height = Length::Fill;
}
self.width = self.width.enclose(child_size.width);
self.height = self.height.enclose(child_size.height);
self.keys.push(key);
self.children.push(child);

11
widget/src/row.rs
View file

@ -106,15 +106,10 @@ where
child: impl Into<Element<'a, Message, Theme, Renderer>>,
) -> Self {
let child = child.into();
let size = child.as_widget().size_hint();
let child_size = child.as_widget().size_hint();
if size.width.is_fill() {
self.width = Length::Fill;
}
if size.height.is_fill() {
self.height = Length::Fill;
}
self.width = self.width.enclose(child_size.width);
self.height = self.height.enclose(child_size.height);
self.children.push(child);
self