lisyarus/psemek
1
0
Fork 1
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Make ui::screen use new size constrains api

Browse source
This commit is contained in:
Nikita Lisitsa 2022-05-26 23:54:15 +03:00
parent 21ae912271
commit 2574b7aa2b
1 changed files with 68 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
libs/ui/source/screen.cpp
View file

@ -40,36 +40,38 @@ namespace psemek::ui
void screen::reshape(geom::box<float, 2> const & bbox) void screen::reshape(geom::box<float, 2> const & bbox)
{ {
shape_.box = bbox; shape_.box = bbox;
auto const m = bbox.center();
auto cs = children(); auto cs = children();
for (std::size_t i = 0; i < cs.size(); ++i) for (std::size_t i = 0; i < cs.size(); ++i)
{ {
auto c = cs[i]; auto c = cs[i];
if (!c) continue; if (!c) continue;
auto sc = c->size_constraints();
auto size = bbox.dimensions();
size[0] = std::min(size[0], sc[0].min);
size[1] = std::min(size[1], sc[1].min);
auto m = bbox.center(); auto sc = c->size_constraints();
geom::box<float, 2> cbox = c->shape().bbox(); geom::box<float, 2> cbox = c->shape().bbox();
auto update_width = [&](float width)
{
width = std::min(bbox[0].length(), width);
switch (policies_[i].x) switch (policies_[i].x)
{ {
case x_policy::left: case x_policy::left:
cbox[0] = {bbox[0].min, bbox[0].min + size[0]}; cbox[0] = {bbox[0].min, bbox[0].min + width};
break; break;
case x_policy::center: case x_policy::center:
cbox[0] = {m[0] - size[0] / 2.f, m[0] + size[0] / 2.f}; cbox[0] = {m[0] - width / 2.f, m[0] + width / 2.f};
break; break;
case x_policy::right: case x_policy::right:
cbox[0] = {bbox[0].max - size[0], bbox[0].max}; cbox[0] = {bbox[0].max - width, bbox[0].max};
break; break;
case x_policy::fill: case x_policy::fill:
cbox[0] = bbox[0]; cbox[0] = bbox[0];
break; break;
case x_policy::floating: case x_policy::floating:
cbox[0] = geom::expand(cbox[0], (size[0] - cbox[0].length()) / 2.f); cbox[0] = geom::expand(cbox[0], (width - cbox[0].length()) / 2.f);
if (cbox[0].min < bbox[0].min) if (cbox[0].min < bbox[0].min)
cbox[0] += (bbox[0].min - cbox[0].min); cbox[0] += (bbox[0].min - cbox[0].min);
@ -77,23 +79,28 @@ namespace psemek::ui
cbox[0] -= (cbox[0].max - bbox[0].max); cbox[0] -= (cbox[0].max - bbox[0].max);
break; break;
} }
};
auto update_height = [&](float height)
{
height = std::min(bbox[1].length(), height);
switch (policies_[i].y) switch (policies_[i].y)
{ {
case y_policy::top: case y_policy::top:
cbox[1] = {bbox[1].min, bbox[1].min + size[1]}; cbox[1] = {bbox[1].min, bbox[1].min + height};
break; break;
case y_policy::center: case y_policy::center:
cbox[1] = {m[1] - size[1] / 2.f, m[1] + size[1] / 2.f}; cbox[1] = {m[1] - height / 2.f, m[1] + height / 2.f};
break; break;
case y_policy::bottom: case y_policy::bottom:
cbox[1] = {bbox[1].max - size[1], bbox[1].max}; cbox[1] = {bbox[1].max - height, bbox[1].max};
break; break;
case y_policy::fill: case y_policy::fill:
cbox[1] = bbox[1]; cbox[1] = bbox[1];
break; break;
case y_policy::floating: case y_policy::floating:
cbox[1] = geom::expand(cbox[1], (size[1] - cbox[1].length()) / 2.f); cbox[1] = geom::expand(cbox[1], (height - cbox[1].length()) / 2.f);
if (cbox[1].min < bbox[1].min) if (cbox[1].min < bbox[1].min)
cbox[1] += (bbox[1].min - cbox[1].min); cbox[1] += (bbox[1].min - cbox[1].min);
@ -101,6 +108,20 @@ namespace psemek::ui
cbox[1] -= (cbox[1].max - bbox[1].max); cbox[1] -= (cbox[1].max - bbox[1].max);
break; break;
} }
};
if (width_first())
{
update_width(sc[0].min);
auto hc = c->height_constraints(cbox[0].length());
update_height(hc.min);
}
else
{
update_height(sc[1].min);
auto wc = c->width_constraints(cbox[1].length());
update_width(wc.min);
}
c->reshape(cbox); c->reshape(cbox);
} }