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

Fix max_height for Scrollable

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2022-07-18 23:38:44 +02:00
parent 7e5a5ae743
commit cdd3802e68
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
native/src/widget/scrollable.rs
View file

@ -162,9 +162,10 @@ pub fn layout<Renderer>(
limits: &layout::Limits,
width: Length,
height: Length,
max_height: u32,
layout_content: impl FnOnce(&Renderer, &layout::Limits) -> layout::Node,
) -> layout::Node {
let limits = limits.width(width).height(height);
let limits = limits.max_height(max_height).width(width).height(height);
let child_limits = layout::Limits::new(
Size::new(limits.min().width, 0.0),
@ -648,6 +649,7 @@ where
limits,
Widget::<Message, Renderer>::width(self),
self.height,
self.max_height,
|renderer, limits| self.content.layout(renderer, limits),
)
}

1
pure/src/widget/scrollable.rs
View file

@ -133,6 +133,7 @@ where
limits,
Widget::<Message, Renderer>::width(self),
self.height,
u32::MAX,
|renderer, limits| {
self.content.as_widget().layout(renderer, limits)
},