language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-10-01 14:21:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix C++ build

Browse source 
Add the preferred size merging logic also to C++ LayoutInfo::merge.

Amends commit 843f52b3c5
This commit is contained in:
Simon Hausmann 2021-04-08 13:16:06 +02:00
parent 7ab518786f
commit b8e621a76b
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
api/sixtyfps-cpp/include/sixtyfps.h
View file

@ -337,6 +337,16 @@ using cbindgen_private::sixtyfps_solve_path_layout;
inline LayoutInfo LayoutInfo::merge(const LayoutInfo &other) const inline LayoutInfo LayoutInfo::merge(const LayoutInfo &other) const
{ {
// Note: This "logic" is duplicated from LayoutInfo::merge in layout.rs. // Note: This "logic" is duplicated from LayoutInfo::merge in layout.rs.
const auto merge_preferred_size = [](float left_stretch, float left_size, float right_stretch,
float right_size) -> float {
if (left_stretch < right_stretch) {
return left_size;
} else if (left_stretch > right_stretch) {
return right_size;
} else {
return (left_size + right_size) / 2.;
}
};
return LayoutInfo { std::max(min_width, other.min_width), return LayoutInfo { std::max(min_width, other.min_width),
std::min(max_width, other.max_width), std::min(max_width, other.max_width),
std::max(min_height, other.min_height), std::max(min_height, other.min_height),
@ -345,6 +355,10 @@ inline LayoutInfo LayoutInfo::merge(const LayoutInfo &other) const
std::min(max_width_percent, other.max_width_percent), std::min(max_width_percent, other.max_width_percent),
std::max(min_height_percent, other.min_height_percent), std::max(min_height_percent, other.min_height_percent),
std::min(max_height_percent, other.max_height_percent), std::min(max_height_percent, other.max_height_percent),
merge_preferred_size(horizontal_stretch, preferred_width,
other.horizontal_stretch, other.preferred_width),
merge_preferred_size(vertical_stretch, preferred_height,
other.vertical_stretch, other.preferred_height),
std::min(horizontal_stretch, other.horizontal_stretch), std::min(horizontal_stretch, other.horizontal_stretch),
std::min(vertical_stretch, other.vertical_stretch) }; std::min(vertical_stretch, other.vertical_stretch) };
} }