ilusha/Modules
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor of layout manager to add support for all menus (dirty unstable)

Browse source
This commit is contained in:
IlyaShurupov 2024-10-20 12:07:16 +03:00
parent 23fe07d3d3
commit c57041a48e
21 changed files with 274 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Widgets/private/Layout.cpp
View file

@ -29,7 +29,11 @@ const Vec2<SizePolicy>& WidgetLayout::getSizePolicy() const { return mSizePolicy
void WidgetLayout::setSizePolicy(SizePolicy x, SizePolicy y) { mSizePolicy = { x, y }; }
WidgetLayout* WidgetLayout::lay(Widget* w) { return w->getLayout(); }
RangeF WidgetLayout::pickRange(const RangeF& current, const RangeF& children, const RangeF& parent, bool vertical) const {
return current;
RangeF out;
switch (mSizePolicy[vertical]) {
@ -44,10 +48,16 @@ RangeF WidgetLayout::pickRange(const RangeF& current, const RangeF& children, co
void WidgetLayout::clampMinMaxSize() {
auto current = getArea();
current.size.clamp(mMinSize, mMaxSize);
auto minContent = minContentArea();
minContent.size.clamp(mMinSize, mMaxSize);
current.clamp(minContent);
setArea(current);
}
void WidgetLayout::pickMinimalRect(bool dir) {
setArea(minContentArea());
}
RangeF WidgetLayout::clampRange(const RangeF& current, const RangeF& child, const RangeF& parent, bool vertical) const {
auto out = current;
@ -84,13 +94,17 @@ RectF WidgetLayout::getChildrenEnclosure() const {
return out;
}
RectF WidgetLayout::getAvailableChildArea() const {
RectF WidgetLayout::availableChildArea() const {
return getArea().relative();
}
RectF WidgetLayout::minContentArea() const {
return getChildrenEnclosure();
}
RectF WidgetLayout::getParentEnclosure() const {
DEBUG_ASSERT(parent())
if (!parent()) return { { 0, 0 }, mMaxSize };
auto out = parent()->getLayout()->getAvailableChildArea();
auto out = parent()->getLayout()->availableChildArea();
return out;
}

3
Widgets/private/Widget.cpp
View file

@ -5,7 +5,8 @@
using namespace tp;
Widget::Widget() {
mArea.setTargetRect({ 100, 100, 10, 10 });
mArea.setTargetRect({ 100, 100, 50, 50 });
setLayout(WidgetManagerInterface::defaultLayout(this));
mArea.endAnimation();

115
Widgets/private/layouts/BasicLayout.cpp
View file

@ -26,20 +26,7 @@ void BasicLayout::pickRect(bool vertical) {
setArea(newArea);
}
void BasicLayout::clampRect() {
DEBUG_ASSERT(0)
auto current = getArea();
auto children = getChildrenEnclosure();
auto parent = getParentEnclosure();
auto rangeX = clampRange(current.getRangeX(), children.getRangeX(), parent.getRangeX(), false);
auto rangeY = clampRange(current.getRangeY(), children.getRangeY(), parent.getRangeY(), true);
setArea(RectF(rangeX, rangeY));
}
void BasicLayout::updateLayout(bool vertical) {
void BasicLayout::arrangeChildren(bool vertical) {
if (children().empty()) return;
if (vertical) {
@ -57,61 +44,64 @@ void BasicLayout::updateLayout(bool vertical) {
}
}
halnf BasicLayout::shrinkLayoutSize(WidgetLayout* widget, halnf diff, bool vertical) {
auto area = widget->getArea();
auto prevSize = area.size[vertical];
area.size[vertical] += diff;
widget->setArea(area);
//widget->clampMinMaxSize();
return widget->getArea().size[vertical] - prevSize;
}
halnf BasicLayout::changeChildSize(tp::Widget* widget, halnf diff, bool vertical) {
auto prevSize = widget->getLayout()->getArea().size[vertical];
{
auto area = widget->getLayout()->getArea();
area.size[vertical] += diff;
widget->setAreaCache(area);
widget->getLayout()->clampMinMaxSize();
}
auto newSize = widget->getLayout()->getArea().size[vertical];
return newSize - prevSize;
bool BasicLayout::canChange(Widget* widget, bool vertical) {
return widget->getLayout()->getSizePolicy()[vertical] == SizePolicy::Expanding;
}
void BasicLayout::adjustLayout(bool vertical) {
std::vector<std::pair<Widget*, bool>> contributors;
Vec2F contentSize = { 0, 0 };
Vec2F availableSize = getArea().size;
for (auto child : children()) {
child->getLayout()->pickRect(vertical);
std::vector<std::pair<WidgetLayout*, bool>> contributors;
halnf contentSize = 0;
if (child->getLayout()->getSizePolicy()[vertical] == SizePolicy::Expanding) {
contributors.emplace_back( child, true );
auto area = child->getLayout()->getArea();
area.size[vertical] = 0;
child->setAreaCache(area);
child->getLayout()->clampMinMaxSize();
// find contributors
for (Widget* child : children()) {
if (canChange(child, vertical)) {
contributors.emplace_back( lay(child), true );
}
contentSize += child->getLayout()->getArea().size;
}
availableSize -= mLayoutGap * ((halnf) children().size() - 1) + mLayoutMargin * 2;
// let each child to chose desired rect
for (Widget* child : children()) {
if (canChange(child, vertical)) {
lay(child)->pickMinimalRect(vertical);
} else {
lay(child)->pickRect(vertical);
}
}
auto diff = availableSize - contentSize;
// calculate content size
for (Widget* child : children()) {
contentSize += lay(child)->getArea().size[vertical];
}
halnf availableSize = getArea().size[vertical] - (mLayoutGap * ((halnf) children().size() - 1) + mLayoutMargin * 2);
if (availableSize < 0) return;
halnf totalQuota = availableSize - contentSize;
// expand or contract as much as possible
while (!contributors.empty() && (diff[vertical] != 0)) {
auto quota = diff / (halnf) contributors.size();
while (!contributors.empty() && (totalQuota != 0)) {
halnf quotaPerContributor = totalQuota / (halnf) contributors.size();
for (auto& contributor : contributors) {
if (!contributor.second) continue;
// contributor.first->endAnimations();
auto contribution = changeChildSize(contributor.first, quota[vertical], vertical);
halnf contribution = shrinkLayoutSize(contributor.first, quotaPerContributor, vertical);
if (contribution == 0) {
contributor.second = false;
}
diff[vertical] -= contribution;
totalQuota -= contribution;
}
// remove useless contributors
contributors.erase(
std::remove_if(contributors.begin(), contributors.end(), [](auto node) { return !node.second; }),
contributors.end()
@ -120,30 +110,31 @@ void BasicLayout::adjustLayout(bool vertical) {
// set opposite direction size
for (auto child : children()) {
// if (child->getLayout()->getSizePolicy()[!vertical] != SizePolicy::Minimal) {
auto area = child->getLayout()->getArea();
area.size[!vertical] = getArea().size[!vertical] - mLayoutMargin * 2;
child->setAreaCache(area);
// }
RectF area = lay(child)->getArea();
area.size[!vertical] = getArea().size[!vertical] - mLayoutMargin * 2;
child->setAreaCache(area);
}
// set pos
halnf iterPos = mLayoutMargin;
for (auto child : children()) {
auto area = child->getLayout()->getArea();
RectF area = lay(child)->getArea();
area.pos[vertical] = iterPos;
area.pos[!vertical] = mLayoutMargin;
iterPos += area.size[vertical] + mLayoutGap;
child->setAreaCache(area);
// child->updateAnimations();
// child->triggerWidgetUpdate("layout changed");
lay(child)->setArea(area);
}
}
RectF BasicLayout::getAvailableChildArea() const {
auto out = WidgetLayout::getAvailableChildArea();
RectF BasicLayout::availableChildArea() const {
auto out = WidgetLayout::availableChildArea();
return out.shrinkFromCenter(mLayoutMargin, true);
}
RectF BasicLayout::minContentArea() const {
auto out = WidgetLayout::getChildrenEnclosure();
out.shrinkFromCenter(-mLayoutMargin, true);
return out;
}

2
Widgets/private/layouts/DockLayout.cpp
View file

@ -188,7 +188,7 @@ auto DockLayout::getSideFromWidget(Widget* widget) -> Side {
return DockLayout::NONE;
}
void DockLayout::updateLayout(bool vertical) {
void DockLayout::arrangeChildren(bool vertical) {
for (auto child : children()) {
child->getLayout()->pickRect(vertical);
}

2
Widgets/private/layouts/OverlayLayout.cpp
View file

@ -5,7 +5,7 @@
using namespace tp;
void OverlayLayout::updateLayout(bool vertical) {
void OverlayLayout::arrangeChildren(bool vertical) {
if (vertical) return;
if (children().empty()) return;

4
Widgets/private/layouts/ScrollableLayout.cpp
View file

@ -5,7 +5,7 @@
using namespace tp;
void ScrollableLayout::updateLayout(bool vertical) {
void ScrollableLayout::arrangeChildren(bool vertical) {
if (vertical) return;
// TODO : make better interface to get scroller and content widget
@ -44,7 +44,7 @@ void ScrollableLayout::updateWidgetRects(const RectF& area, Widget* content, Scr
content->getLayout()->setArea(contentArea);
}
RectF ScrollableLayout::getAvailableChildArea() const {
RectF ScrollableLayout::availableChildArea() const {
auto out = getArea();
// dont constrain on scroll axis
out.pos = -FLT_MAX / 4;

8
Widgets/private/managers/LayoutManager.cpp
View file

@ -3,6 +3,7 @@
#include "DockLayout.hpp"
#include "ScrollableLayout.hpp"
#include "BasicLayout.hpp"
#include <algorithm>
@ -78,7 +79,7 @@ void LayoutManager::adjustLayouts() {
});
for (auto& [iter, _] : mLayOrder) {
iter->getLayout()->updateLayout(mVertical);
iter->getLayout()->arrangeChildren(mVertical);
}
}
@ -92,10 +93,13 @@ static int sizePolicyDep[3][3] = {
int LayoutManager::getLayoutOrder(WidgetLayout* parent, WidgetLayout* child) const {
if (!parent || !child) return 0;
return 1;
auto policyParent = parent->getSizePolicy()[mVertical];
auto policyChild = parent->getSizePolicy()[mVertical];
if (dynamic_cast<DockLayout*>(parent)) return -1;
// if (dynamic_cast<DockLayout*>(parent)) return -1;
// if (dynamic_cast<BasicLayout*>(parent)) return -1;
// if (dynamic_cast<ScrollableLayout*>(parent)) return -1;
return sizePolicyDep[int(policyParent)][int(policyChild)];

27
Widgets/private/widgets/FloatingWidget.cpp
View file

@ -47,30 +47,3 @@ FloatingLayout* FloatingWidget::layout() { return dynamic_cast<FloatingLayout*>(
const FloatingLayout* FloatingWidget::layout() const {
return dynamic_cast<const FloatingLayout*>(Widget::getLayout());
}
FloatingMenu::FloatingMenu() : FloatingWidget() {
setDebug("float menu", { 0.0, 0.9, 0.1, 0.7 });
// addChild(&mMenuLayout);
addChild(&mHeader);
addChild(&mBodyLayout);
mHeader.setText("Menu");
mHeader.setSizePolicy(SizePolicy::Expanding, SizePolicy::Minimal);
mBodyLayout.setSizePolicy(SizePolicy::Expanding, SizePolicy::Expanding);
mBodyLayout.setLayout(new ScrollableLayout(&mBodyLayout));
mBodyLayout.addChild(&mScrollBar);
mBodyLayout.addChild(&mContentWidget);
mContentWidget.setSizePolicy(SizePolicy::Minimal, SizePolicy::Minimal);
// getLayout()->setLayoutPolicy(LayoutPolicy::Vertical);
// mBodyLayout.getLayout()->setLayoutPolicy(LayoutPolicy::Vertical);
}
void FloatingMenu::setText(const std::string& text) {
mHeader.setText(text);
}

58
Widgets/private/widgets/MenuWidgets.cpp Normal file
View file

@ -0,0 +1,58 @@
#include "MenuWidgets.hpp"
#include "ScrollableLayout.hpp"
using namespace tp;
CollapsingMenuWidget::CollapsingMenuWidget() {
setDebug("Collapsing Menu", {1});
setSizePolicy(SizePolicy::Expanding, SizePolicy::Minimal);
addChild(&mHeader);
addChild(&mContent);
}
void CollapsingMenuWidget::process(const EventHandler& events) {
mHover = mHeader.getArea().isInside(events.getPointer());
if (events.isPressed(InputID::MOUSE1) && mHover) setCollapsed(!mContent.getEnabled());
}
void CollapsingMenuWidget::setCollapsed(bool collapsed) {
mContent.setEnabled(collapsed);
}
void CollapsingMenuWidget::draw(Canvas& canvas) {
canvas.rect(getArea().relative(), colorBG, rounding);
if (mHover) {
canvas.rect(mHeader.getArea(), colorHover, rounding);
}
}
FloatingScrollableMenu::FloatingScrollableMenu() : FloatingWidget() {
setDebug("float menu", { 0.0, 0.9, 0.1, 0.7 });
// addChild(&mMenuLayout);
addChild(&mHeader);
addChild(&mBodyLayout);
mHeader.setText("Menu");
mHeader.setSizePolicy(SizePolicy::Expanding, SizePolicy::Minimal);
mBodyLayout.setSizePolicy(SizePolicy::Expanding, SizePolicy::Expanding);
mBodyLayout.setLayout(new ScrollableLayout(&mBodyLayout));
mBodyLayout.addChild(&mScrollBar);
mBodyLayout.addChild(&mContentWidget);
mContentWidget.setSizePolicy(SizePolicy::Minimal, SizePolicy::Minimal);
// getLayout()->setLayoutPolicy(LayoutPolicy::Vertical);
// mBodyLayout.getLayout()->setLayoutPolicy(LayoutPolicy::Vertical);
}
void FloatingScrollableMenu::setText(const std::string& text) {
mHeader.setText(text);
}

2
Widgets/private/widgets/SimpleWidgets.cpp
View file

@ -107,7 +107,7 @@ void SliderWidget::process(const EventHandler& events) {
}
void SliderWidget::draw(Canvas& canvas) {
canvas.rect(getArea().relative(), mColorBG, mRounding);
canvas.rect(getRelativeArea(), mColorBG, mRounding);
switch (mState) {
case IDLE: canvas.rect(getHandleArea(), mColorIdle, mRounding); break;