Fix max_width and max_height for Container
This commit is contained in:
parent
61fd5b0050
commit
7e5a5ae743
2 changed files with 13 additions and 1 deletions
|
|
@ -127,12 +127,20 @@ pub fn layout<Renderer>(
|
||||||
limits: &layout::Limits,
|
limits: &layout::Limits,
|
||||||
width: Length,
|
width: Length,
|
||||||
height: Length,
|
height: Length,
|
||||||
|
max_width: u32,
|
||||||
|
max_height: u32,
|
||||||
padding: Padding,
|
padding: Padding,
|
||||||
horizontal_alignment: alignment::Horizontal,
|
horizontal_alignment: alignment::Horizontal,
|
||||||
vertical_alignment: alignment::Vertical,
|
vertical_alignment: alignment::Vertical,
|
||||||
layout_content: impl FnOnce(&Renderer, &layout::Limits) -> layout::Node,
|
layout_content: impl FnOnce(&Renderer, &layout::Limits) -> layout::Node,
|
||||||
) -> layout::Node {
|
) -> layout::Node {
|
||||||
let limits = limits.loose().width(width).height(height).pad(padding);
|
let limits = limits
|
||||||
|
.loose()
|
||||||
|
.max_width(max_width)
|
||||||
|
.max_height(max_height)
|
||||||
|
.width(width)
|
||||||
|
.height(height)
|
||||||
|
.pad(padding);
|
||||||
|
|
||||||
let mut content = layout_content(renderer, &limits.loose());
|
let mut content = layout_content(renderer, &limits.loose());
|
||||||
let size = limits.resolve(content.size());
|
let size = limits.resolve(content.size());
|
||||||
|
|
@ -171,6 +179,8 @@ where
|
||||||
limits,
|
limits,
|
||||||
self.width,
|
self.width,
|
||||||
self.height,
|
self.height,
|
||||||
|
self.max_width,
|
||||||
|
self.max_height,
|
||||||
self.padding,
|
self.padding,
|
||||||
self.horizontal_alignment,
|
self.horizontal_alignment,
|
||||||
self.vertical_alignment,
|
self.vertical_alignment,
|
||||||
|
|
|
||||||
|
|
@ -156,6 +156,8 @@ where
|
||||||
limits,
|
limits,
|
||||||
self.width,
|
self.width,
|
||||||
self.height,
|
self.height,
|
||||||
|
self.max_width,
|
||||||
|
self.max_height,
|
||||||
self.padding,
|
self.padding,
|
||||||
self.horizontal_alignment,
|
self.horizontal_alignment,
|
||||||
self.vertical_alignment,
|
self.vertical_alignment,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue