mirror of
https://github.com/slint-ui/slint.git
synced 2025-10-01 06:11:16 +00:00
Change behavior of percent sice within the layout
So that size with percentages don't affect the maximum/minimum size Fixes #117
This commit is contained in:
parent
0174db3679
commit
096f55e365
10 changed files with 302 additions and 57 deletions
|
@ -339,6 +339,10 @@ inline LayoutInfo LayoutInfo::merge(const LayoutInfo &other) const
|
|||
std::min(max_width, other.max_width),
|
||||
std::max(min_height, other.min_height),
|
||||
std::min(max_height, other.max_height),
|
||||
std::max(min_width_percent, other.min_width_percent),
|
||||
std::min(max_width_percent, other.max_width_percent),
|
||||
std::max(min_height_percent, other.min_height_percent),
|
||||
std::min(max_height_percent, other.max_height_percent),
|
||||
std::min(horizontal_stretch, other.horizontal_stretch),
|
||||
std::min(vertical_stretch, other.vertical_stretch) };
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue