language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-09-30 22:01:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Rename Component::compute_layout to apply_layout

Browse source 
And pass the expected rectangle.
This is currently not used yet but will be needed when we can have
repeated elements within a box layout
This commit is contained in:
Olivier Goffart 2020-10-29 16:14:07 +01:00
parent 7d3337e1d1
commit 5face45c51
20 changed files with 69 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -281,6 +281,7 @@ using cbindgen_private::solve_grid_layout;
using cbindgen_private::solve_box_layout;
using cbindgen_private::box_layout_info;
using cbindgen_private::solve_path_layout;
using cbindgen_private::Rect;
inline LayoutInfo LayoutInfo::merge(const LayoutInfo &other) const {
// Note: This "logic" is duplicated from LayoutInfo::merge in layout.rs.
@ -461,7 +462,7 @@ class Repeater
};
public:
// FIXME: should be private, but compute_layout uses it.
// FIXME: should be private, but layouting code uses it.
mutable std::shared_ptr<RepeaterInner> inner;
template<typename F>
@ -531,12 +532,12 @@ public:
return { &C::component_type, x.ptr.get() };
}
void compute_layout() const
void compute_layout(cbindgen_private::Rect parent_rect) const
{
if (!inner)
return;
for (auto &x : inner->data) {
x.ptr->compute_layout({ &C::component_type, x.ptr.get() });
x.ptr->apply_layout({ &C::component_type, x.ptr.get() }, parent_rect);
}
}