Initial size handling
This commit is contained in:
IlyaShurupov
Ilya Shurupov
parent
9f9dcd5882
commit
0b73f8037b
28 changed files with 543 additions and 135 deletions
|
|
@ -11,7 +11,7 @@ using namespace tp;
|
|||
class WidgetApplication : public Application {
|
||||
public:
|
||||
WidgetApplication() {
|
||||
setup1();
|
||||
setup2();
|
||||
}
|
||||
|
||||
void setup1() {
|
||||
|
|
@ -20,8 +20,8 @@ public:
|
|||
mDockLayout.addChild(&mFloatingMenu);
|
||||
mDockLayout.addChild(&mFloatingMenu2);
|
||||
|
||||
mDockLayout.setCenterWidget(&mButton3);
|
||||
mDockLayout.dockWidget(&mButton4, DockLayoutWidget::RIGHT);
|
||||
mDockLayout.setCenterWidget(&mButton4);
|
||||
mDockLayout.dockWidget(&mButton3, DockLayoutWidget::RIGHT);
|
||||
|
||||
mFloatingMenu.addToMenu(&mButton);
|
||||
mFloatingMenu2.addToMenu(&mButton2);
|
||||
|
|
@ -29,6 +29,11 @@ public:
|
|||
mButton.setAction([this]() { mButton2.setColor(RGBA::random()); });
|
||||
mButton2.setAction([this]() { mButton.setColor(RGBA::random()); });
|
||||
|
||||
mButton3.setAction([this]() { mDockLayout.dockWidget(&mFloatingMenu, DockLayoutWidget::Side::LEFT); });
|
||||
mButton3.setText("dock");
|
||||
|
||||
mButton4.setAction([this]() { mDockLayout.undockWidget(DockLayoutWidget::Side::LEFT); });
|
||||
|
||||
// mLayoutWidget.addChild(&mButton2);
|
||||
|
||||
// mWidgetFloating.addChild(&mButton);
|
||||
|
|
@ -48,7 +53,24 @@ public:
|
|||
}
|
||||
|
||||
void setup2() {
|
||||
mRootWidget.setRootWidget(&mLabel);
|
||||
mRootWidget.setRootWidget(&mDesktopLayout);
|
||||
mDesktopLayout.addChild(&mWidget);
|
||||
|
||||
mWidget.addChild(&mButton);
|
||||
mWidget.addChild(&mButton2);
|
||||
mWidget.addChild(&mButton3);
|
||||
|
||||
mButton.setSizePolicy(Widget::SizePolicy::Expand, Widget::SizePolicy::Contract);
|
||||
mButton2.setSizePolicy(Widget::SizePolicy::Expand, Widget::SizePolicy::Contract);
|
||||
mButton3.setSizePolicy(Widget::SizePolicy::Expand, Widget::SizePolicy::Contract);
|
||||
|
||||
mWidget.setSizePolicy(Widget::SizePolicy::Contract, Widget::SizePolicy::Contract);
|
||||
mWidget.setLayoutPolicy(Widget::LayoutPolicy::Horizontally);
|
||||
|
||||
mButton.setAction([this]() { mButton2.setMinSize(mButton2.getMinSize() + 10); });
|
||||
mButton2.setAction([this]() { mButton.setMinSize(mButton.getMinSize() + 10); } );
|
||||
|
||||
RootWidget::setWidgetArea(mWidget, { 300, 100, 150, 200 });
|
||||
}
|
||||
|
||||
void processFrame(EventHandler* eventHandler, halnf deltaTime) override {
|
||||
|
|
@ -67,6 +89,8 @@ public:
|
|||
}
|
||||
|
||||
private:
|
||||
Widget mWidget;
|
||||
|
||||
ButtonWidget mButton;
|
||||
ButtonWidget mButton2;
|
||||
ButtonWidget mButton3;
|
||||
|
|
@ -78,7 +102,7 @@ private:
|
|||
LabelWidget mLabel;
|
||||
FloatingWidget mWidgetFloating;
|
||||
AnimationTestWidget mAnimationTestWidget;
|
||||
DesktopLayout mLayoutWidget;
|
||||
DesktopLayout mDesktopLayout;
|
||||
|
||||
DockLayoutWidget mDockLayout;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
#include "DockLayoutWidget.hpp"
|
||||
#include "FloatingWidget.hpp"
|
||||
|
||||
using namespace tp;
|
||||
|
||||
|
|
@ -11,9 +12,33 @@ DockLayoutWidget::DockLayoutWidget() {
|
|||
|
||||
void DockLayoutWidget::process(const EventHandler& events) {
|
||||
// calculateHeaderAreas();
|
||||
// handlePreview(events);
|
||||
|
||||
handleResizeEvents(events);
|
||||
Widget* floater = nullptr;
|
||||
for (auto child : mChildren) {
|
||||
if (auto iter = dynamic_cast<FloatingWidget*>(child)) {
|
||||
if (iter->isFloating()) {
|
||||
floater = iter;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (floater) undockWidget(getSideFromWidget(floater), false);
|
||||
|
||||
if (floater) {
|
||||
handlePreview(events);
|
||||
}
|
||||
|
||||
if (mPreviewWidget && !floater) {
|
||||
dockWidget(mPreviewWidget, mPreviewSide);
|
||||
}
|
||||
|
||||
mPreviewWidget = floater;
|
||||
|
||||
if (!mPreviewWidget) {
|
||||
handleResizeEvents(events);
|
||||
}
|
||||
|
||||
calculateSideAreas();
|
||||
calculateResizeHandles();
|
||||
updateChildSideWidgets();
|
||||
|
|
@ -40,7 +65,7 @@ void DockLayoutWidget::drawOverlay(Canvas& canvas) {
|
|||
canvas.rect(sideWidget.headerArea, mResizeHandleColorActive, 0);
|
||||
}
|
||||
|
||||
if (mPreview) {
|
||||
if (mPreviewWidget) {
|
||||
if (mPreviewSide != NONE) canvas.rect(mPreviewArea.shrink(mPadding * 2), mPreviewColor, mRounding);
|
||||
|
||||
for (auto& sideWidget : mSideWidgets) {
|
||||
|
|
@ -64,10 +89,16 @@ void DockLayoutWidget::setCenterWidget(Widget* widget) {
|
|||
}
|
||||
|
||||
void DockLayoutWidget::dockWidget(Widget* widget, Side side) {
|
||||
DEBUG_ASSERT(!sideExists(side))
|
||||
if (sideExists(side) || side == Side::NONE) return;
|
||||
|
||||
addChild(widget);
|
||||
|
||||
widget->bringToBack();
|
||||
if (mCenterWidget) mCenterWidget->bringToBack();
|
||||
for (auto& order : mSideWidgets) {
|
||||
if (order.widget) order.widget->bringToBack();
|
||||
}
|
||||
|
||||
auto& sideWidget = mSideWidgets[side];
|
||||
sideWidget.widget = widget;
|
||||
|
||||
|
|
@ -79,10 +110,21 @@ void DockLayoutWidget::dockWidget(Widget* widget, Side side) {
|
|||
}
|
||||
|
||||
sideWidget.hidden = false;
|
||||
sideWidget.areaBeforeDocking = widget->getArea();
|
||||
}
|
||||
|
||||
void DockLayoutWidget::undockWidget(Side side) {
|
||||
DEBUG_ASSERT(sideExists(side))
|
||||
void DockLayoutWidget::undockWidget(Side side, bool restoreArea) {
|
||||
if (!sideExists(side) || (side == Side::NONE)) return;
|
||||
|
||||
auto& sideWidget = mSideWidgets[side];
|
||||
|
||||
sideWidget.widget->bringToFront();
|
||||
|
||||
if (restoreArea) {
|
||||
sideWidget.widget->setArea(sideWidget.areaBeforeDocking);
|
||||
} else {
|
||||
sideWidget.widget->endAnimations();
|
||||
}
|
||||
|
||||
bool removed = false;
|
||||
for (ualni i = 0; i < 3; i++) {
|
||||
|
|
@ -275,7 +317,9 @@ bool DockLayoutWidget::isSideVisible(DockLayoutWidget::Side side) {
|
|||
return sideExists(side) && !mSideWidgets[side].hidden;
|
||||
}
|
||||
|
||||
bool DockLayoutWidget::sideExists(DockLayoutWidget::Side side) { return mSideWidgets[side].widget; }
|
||||
bool DockLayoutWidget::sideExists(DockLayoutWidget::Side side) {
|
||||
return mSideWidgets[side].widget;
|
||||
}
|
||||
|
||||
ualni DockLayoutWidget::getVisibleSidesSize() {
|
||||
ualni out = 0;
|
||||
|
|
@ -286,11 +330,6 @@ ualni DockLayoutWidget::getVisibleSidesSize() {
|
|||
}
|
||||
|
||||
void DockLayoutWidget::handlePreview(const EventHandler& events) {
|
||||
if (!mPreview) {
|
||||
mPreviewSide = NONE;
|
||||
return;
|
||||
}
|
||||
|
||||
const halnf factor = 0.3;
|
||||
const halnf handleFactor = 0.1;
|
||||
|
||||
|
|
@ -313,6 +352,7 @@ void DockLayoutWidget::handlePreview(const EventHandler& events) {
|
|||
|
||||
mPreviewArea = {};
|
||||
mPreviewSide = NONE;
|
||||
|
||||
for (auto& sideWidget : mSideWidgets) {
|
||||
if (sideWidget.widget) continue;
|
||||
|
||||
|
|
@ -322,3 +362,10 @@ void DockLayoutWidget::handlePreview(const EventHandler& events) {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
auto DockLayoutWidget::getSideFromWidget(Widget* widget) -> Side {
|
||||
for (auto& sideWidget : mSideWidgets) {
|
||||
if (sideWidget.widget == widget) return sideWidget.side;
|
||||
}
|
||||
return DockLayoutWidget::NONE;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,16 +28,20 @@ void FloatingWidget::process(const EventHandler& events) {
|
|||
// triggerWidgetUpdate();
|
||||
}
|
||||
|
||||
void FloatingWidget::adjustRect() {
|
||||
auto area = getArea();
|
||||
void FloatingWidget::pickRect() {
|
||||
if (mIsFloating) {
|
||||
auto area = getArea();
|
||||
|
||||
if (mIsResizing) {
|
||||
area.size = mPointerCurrent + mHandleSize / 2.f;
|
||||
} else if (mIsFloating) {
|
||||
area.pos += mPointerCurrent - mPointerStart;
|
||||
if (mIsResizing) {
|
||||
area.size = mPointerCurrent + mHandleSize / 2.f;
|
||||
} else if (mIsFloating) {
|
||||
area.pos += mPointerCurrent - mPointerStart;
|
||||
}
|
||||
|
||||
setArea(area);
|
||||
} else {
|
||||
Widget::pickRect();
|
||||
}
|
||||
|
||||
setArea(area);
|
||||
}
|
||||
|
||||
void FloatingWidget::draw(Canvas& canvas) {
|
||||
|
|
@ -55,4 +59,8 @@ RectF FloatingWidget::resizeHandleRect() {
|
|||
|
||||
bool FloatingWidget::propagateEventsToChildren() const {
|
||||
return !mIsFloating;
|
||||
}
|
||||
|
||||
bool FloatingWidget::isFloating() const {
|
||||
return mIsFloating;
|
||||
}
|
||||
|
|
@ -12,6 +12,12 @@ void RootWidget::setRootWidget(Widget* widget) {
|
|||
}
|
||||
|
||||
void RootWidget::processFrame(EventHandler* events, const RectF& screenArea) {
|
||||
if (mDebug) {
|
||||
events->setEnableKeyEvents(true);
|
||||
if (events->isPressed(InputID::K)) mDebugStopProcessing = !mDebugStopProcessing;
|
||||
if (mDebugStopProcessing) return;
|
||||
}
|
||||
|
||||
mScreenArea = screenArea;
|
||||
|
||||
mRoot->setArea(screenArea);
|
||||
|
|
@ -38,6 +44,7 @@ void RootWidget::processFrame(EventHandler* events, const RectF& screenArea) {
|
|||
|
||||
// check triggered widgets for removal
|
||||
erase_if(mTriggeredWidgets, [this](auto widget) {
|
||||
widget->updateAnimations();
|
||||
if (mWidgetsToProcess.find(widget) == mWidgetsToProcess.end()) return false;
|
||||
auto end = !widget->needsNextFrame();
|
||||
if (end) {
|
||||
|
|
@ -47,7 +54,7 @@ void RootWidget::processFrame(EventHandler* events, const RectF& screenArea) {
|
|||
});
|
||||
}
|
||||
|
||||
bool RootWidget::needsUpdate() const { return !mTriggeredWidgets.empty(); }
|
||||
bool RootWidget::needsUpdate() const { return !mTriggeredWidgets.empty() || mDebugRedrawAlways; }
|
||||
|
||||
void RootWidget::drawFrame(Canvas& canvas) {
|
||||
// draw from top to bottom
|
||||
|
|
@ -60,8 +67,44 @@ void RootWidget::drawFrame(Canvas& canvas) {
|
|||
|
||||
if (mDebug) {
|
||||
drawDebug(canvas, mRoot, { 0, 0 }, 0);
|
||||
|
||||
ImGui::Text("Triggered Widgets: %i", (int) mTriggeredWidgets.size());
|
||||
ImGui::Text("Widgets To Process: %i", (int) mWidgetsToProcess.size());
|
||||
|
||||
ImGui::Text("To Toggle processing press k");
|
||||
ImGui::Checkbox("Stop processing", &mDebugStopProcessing);
|
||||
ImGui::Checkbox("Force new frames", &mDebugRedrawAlways);
|
||||
|
||||
|
||||
if (mInFocusWidget) {
|
||||
ImGui::Text("Item under cursor %s", mInFocusWidget->mName.c_str());
|
||||
|
||||
if (ImGui::BeginListBox("##empty", { -FLT_MIN, 0 })) {
|
||||
for (auto widget = mInFocusWidget; widget && widget != this; widget = widget->mParent) {
|
||||
if (ImGui::CollapsingHeader(widget->mName.c_str())) {
|
||||
ImGui::InputFloat2("min size", &widget->mMinSize.x);
|
||||
ImGui::InputFloat2("max size", &widget->mMaxSize.x);
|
||||
|
||||
int sizePolicyX = int(widget->mSizePolicy.x);
|
||||
int sizePolicyY = int(widget->mSizePolicy.y);
|
||||
int layout = int(widget->mLayoutPolicy);
|
||||
|
||||
if (ImGui::Combo("Size Policy X", &sizePolicyX, "Passive\0Expand\0Contract\0")) {
|
||||
widget->setSizePolicy(SizePolicy(sizePolicyX), SizePolicy(sizePolicyY));
|
||||
}
|
||||
|
||||
if (ImGui::Combo("Size Policy Y", &sizePolicyY, "Passive\0Expand\0Contract\0")) {
|
||||
widget->setSizePolicy(SizePolicy(sizePolicyX), SizePolicy(sizePolicyY));
|
||||
}
|
||||
|
||||
if (ImGui::Combo("Layout", &layout, "Passive\0Vertical\0Horizontal\0")) {
|
||||
widget->setLayoutPolicy(LayoutPolicy(layout));
|
||||
}
|
||||
}
|
||||
}
|
||||
ImGui::EndListBox();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -205,12 +248,13 @@ void RootWidget::updateWidget(Widget* widget) {
|
|||
void RootWidget::adjustSizes(ActiveTreeNode* iter) {
|
||||
if (!iter) return;
|
||||
|
||||
iter->widget->adjustRect();
|
||||
iter->widget->adjustChildrenRect();
|
||||
|
||||
for (auto child : iter->children) {
|
||||
adjustSizes(child);
|
||||
}
|
||||
|
||||
iter->widget->pickRect();
|
||||
iter->widget->adjustChildrenRect();
|
||||
// iter->widget->pickRect();
|
||||
}
|
||||
|
||||
void RootWidget::processActiveTree(ActiveTreeNode* iter, EventHandler& events) {
|
||||
|
|
@ -257,6 +301,8 @@ void RootWidget::processFocusItems(EventHandler& events) {
|
|||
|
||||
events.setCursorOrigin(widgetGlobalPos[iter]);
|
||||
|
||||
widget->mLocalPoint = events.getPointer();
|
||||
|
||||
if (!eventsProcessed && widget->processesEvents()) {
|
||||
events.setEnableKeyEvents(true);
|
||||
|
||||
|
|
@ -266,6 +312,7 @@ void RootWidget::processFocusItems(EventHandler& events) {
|
|||
events.setEnableKeyEvents(false);
|
||||
eventsProcessed = true;
|
||||
} else {
|
||||
|
||||
widget->updateAnimations();
|
||||
widget->process(events);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ void ButtonWidget::setColor(const RGBA& in) {
|
|||
}
|
||||
|
||||
void ButtonWidget::process(const EventHandler& eventHandler) {
|
||||
if (getArea().isInside(eventHandler.getPointer())) {
|
||||
if (getRelativeArea().isInside(eventHandler.getPointer())) {
|
||||
if (eventHandler.isPressed(InputID::MOUSE1)) {
|
||||
mAction();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
#include "Widget.hpp"
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
using namespace tp;
|
||||
|
||||
WidgetManagerInterface* Widget::getRoot() {
|
||||
|
|
@ -17,26 +19,33 @@ void Widget::triggerWidgetUpdate() {
|
|||
}
|
||||
|
||||
Widget::Widget() {
|
||||
mArea.setTargetRect({ 10, 10, 100, 40, });
|
||||
mArea.setTargetRect({ 100, 100, 10, 10, });
|
||||
mArea.endAnimation();
|
||||
}
|
||||
|
||||
void Widget::setArea(const RectF& area) {
|
||||
mArea.setTargetRect(area);
|
||||
if (mArea.getTargetRect() == area) return;
|
||||
|
||||
if (!mArea.shouldEndTransition()) {
|
||||
triggerWidgetUpdate();
|
||||
}
|
||||
mArea.setTargetRect(area);
|
||||
triggerWidgetUpdate();
|
||||
}
|
||||
|
||||
RectF Widget::getArea() const {
|
||||
return mArea.getCurrentRect();
|
||||
}
|
||||
|
||||
RectF Widget::getAreaT() const {
|
||||
return mArea.getTargetRect();
|
||||
}
|
||||
|
||||
RectF Widget::getRelativeArea() const {
|
||||
return { {}, mArea.getCurrentRect().size };
|
||||
}
|
||||
|
||||
RectF Widget::getRelativeAreaT() const {
|
||||
return { {}, mArea.getTargetRect().size };
|
||||
}
|
||||
|
||||
void Widget::endAnimations() {
|
||||
mArea.endAnimation();
|
||||
}
|
||||
|
|
@ -53,20 +62,11 @@ bool Widget::needsNextFrame() const {
|
|||
return !mArea.shouldEndTransition();
|
||||
}
|
||||
|
||||
void Widget::adjustRect() {
|
||||
if (mChildren.empty()) return;
|
||||
|
||||
auto area = (*mChildren.begin())->getArea();
|
||||
for (auto widget : mChildren) {
|
||||
area.expand(widget->getArea());
|
||||
}
|
||||
}
|
||||
|
||||
void Widget::bringToFront() {
|
||||
if (!mParent) return;
|
||||
auto& order = mParent->mDepthOrder;
|
||||
auto node = order.find(this);
|
||||
DEBUG_ASSERT(node);
|
||||
DEBUG_ASSERT(node)
|
||||
order.detach(node);
|
||||
order.pushFront(node);
|
||||
}
|
||||
|
|
@ -75,18 +75,11 @@ void Widget::bringToBack() {
|
|||
if (!mParent) return;
|
||||
auto& order = mParent->mDepthOrder;
|
||||
auto node = order.find(this);
|
||||
DEBUG_ASSERT(node);
|
||||
DEBUG_ASSERT(node)
|
||||
order.detach(node);
|
||||
order.pushBack(node);
|
||||
}
|
||||
|
||||
void Widget::adjustChildrenRect() {
|
||||
auto area = RectF({}, getArea().size);
|
||||
for (auto widget : mChildren) {
|
||||
widget->setArea(area);
|
||||
}
|
||||
}
|
||||
|
||||
void Widget::mouseEnter() {
|
||||
mInFocus = true;
|
||||
}
|
||||
|
|
@ -100,6 +93,15 @@ bool Widget::propagateEventsToChildren() const {
|
|||
}
|
||||
|
||||
void Widget::addChild(Widget* child) {
|
||||
if (auto node = mDepthOrder.find(child)) {
|
||||
node->data->bringToFront();
|
||||
return;
|
||||
}
|
||||
|
||||
if (child->mParent) {
|
||||
child->mParent->removeChild(child);
|
||||
}
|
||||
|
||||
mChildren.push_back(child);
|
||||
mDepthOrder.pushBack(child);
|
||||
|
||||
|
|
@ -108,3 +110,183 @@ void Widget::addChild(Widget* child) {
|
|||
triggerWidgetUpdate();
|
||||
child->triggerWidgetUpdate();
|
||||
}
|
||||
|
||||
void Widget::removeChild(Widget* child) {
|
||||
auto node = mDepthOrder.find(child);
|
||||
if (!node) return;
|
||||
|
||||
mDepthOrder.removeNode(node);
|
||||
mChildren.erase(std::remove(mChildren.begin(), mChildren.end(), child), mChildren.end());
|
||||
|
||||
triggerWidgetUpdate();
|
||||
child->triggerWidgetUpdate();
|
||||
}
|
||||
|
||||
void Widget::setSizePolicy(tp::Widget::SizePolicy x, tp::Widget::SizePolicy y) {
|
||||
mSizePolicy = { x, y };
|
||||
triggerWidgetUpdate();
|
||||
}
|
||||
|
||||
void Widget::setLayoutPolicy(LayoutPolicy layoutPolicy) {
|
||||
mLayoutPolicy = layoutPolicy;
|
||||
triggerWidgetUpdate();
|
||||
}
|
||||
|
||||
const Vec2F& Widget::getMinSize() { return mMinSize; }
|
||||
|
||||
void Widget::setMinSize(const Vec2F& size) {
|
||||
mMinSize = size;
|
||||
triggerWidgetUpdate();
|
||||
}
|
||||
|
||||
void Widget::pickRect() {
|
||||
auto current = getAreaT();
|
||||
auto children = getChildrenEnclosure();
|
||||
auto parent = getParentEnclosure();
|
||||
|
||||
auto rangeX = pickRange(current.getRangeX(), children.getRangeX(), parent.getRangeX(), false);
|
||||
auto rangeY = pickRange(current.getRangeY(), children.getRangeY(), parent.getRangeY(), true);
|
||||
|
||||
auto newArea = RectF(rangeX, rangeY);
|
||||
|
||||
for (auto child : mChildren) {
|
||||
child->setArea(child->getAreaT().move(current.pos - newArea.pos));
|
||||
}
|
||||
|
||||
setArea(newArea);
|
||||
}
|
||||
|
||||
void Widget::clampRect() {
|
||||
auto current = getAreaT();
|
||||
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 Widget::adjustChildrenRect() {
|
||||
if (mChildren.empty()) return;
|
||||
|
||||
switch (mLayoutPolicy) {
|
||||
case LayoutPolicy::Passive: break;
|
||||
case LayoutPolicy::Vertically: adjustLayout(true); break;
|
||||
case LayoutPolicy::Horizontally: adjustLayout(false); break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
halnf Widget::changeChildSize(tp::Widget* widget, halnf diff, bool vertical) {
|
||||
auto prevSize = widget->getAreaT().size[vertical];
|
||||
{
|
||||
auto area = widget->getAreaT();
|
||||
area.size[vertical] += diff;
|
||||
widget->setArea(area);
|
||||
widget->clampRect();
|
||||
}
|
||||
auto newSize = widget->getAreaT().size[vertical];
|
||||
|
||||
return newSize - prevSize;
|
||||
}
|
||||
|
||||
void Widget::adjustLayout(bool vertical) {
|
||||
std::vector<std::pair<Widget*, bool>> contributors;
|
||||
Vec2F contentSize = { 0, 0 };
|
||||
Vec2F availableSize = getRelativeAreaT().size;
|
||||
|
||||
for (auto child : mChildren) {
|
||||
contentSize += child->getAreaT().size;
|
||||
if (child->mSizePolicy[vertical] == SizePolicy::Expand) {
|
||||
contributors.emplace_back( child, true );
|
||||
}
|
||||
}
|
||||
|
||||
auto diff = availableSize - contentSize;
|
||||
|
||||
// expand or contract as much as possible
|
||||
while (!contributors.empty() && (diff[vertical] != 0)) {
|
||||
auto quota = diff / (halnf) contributors.size();
|
||||
|
||||
for (auto& contributor : contributors) {
|
||||
if (!contributor.second) continue;
|
||||
|
||||
auto contribution = changeChildSize(contributor.first, quota[vertical], vertical);
|
||||
|
||||
if (contribution == 0) {
|
||||
contributor.second = false;
|
||||
}
|
||||
|
||||
diff[vertical] -= contribution;
|
||||
}
|
||||
|
||||
contributors.erase(
|
||||
std::remove_if(contributors.begin(), contributors.end(), [](auto node) { return !node.second; }),
|
||||
contributors.end()
|
||||
);
|
||||
}
|
||||
|
||||
// arrange
|
||||
halnf iterPos = 0;
|
||||
for (auto child : mChildren) {
|
||||
auto area = child->getAreaT();
|
||||
area.pos[vertical] = iterPos;
|
||||
iterPos += area.size[vertical];
|
||||
child->setArea(area);
|
||||
}
|
||||
}
|
||||
|
||||
RangeF Widget::pickRange(const RangeF& current, const RangeF& children, const RangeF& parent, bool vertical) {
|
||||
RangeF out;
|
||||
|
||||
switch (mSizePolicy[vertical]) {
|
||||
case SizePolicy::Passive: out = current; break;
|
||||
case SizePolicy::Expand: out = parent; break;
|
||||
case SizePolicy::Contract: out = children; break;
|
||||
}
|
||||
|
||||
out = clampRange(out, children, parent, vertical);
|
||||
return out;
|
||||
}
|
||||
|
||||
RangeF Widget::clampRange(const RangeF& current, const RangeF& children, const RangeF& parent, bool vertical) {
|
||||
auto out = current;
|
||||
|
||||
if (!mChildren.empty()) {
|
||||
auto clampedChild = children;
|
||||
clampedChild.clamp(parent);
|
||||
out.clamp(clampedChild, parent);
|
||||
} else {
|
||||
out.clamp(parent);
|
||||
}
|
||||
|
||||
// clamp min max sizes
|
||||
auto len = clamp(current.size(), mMinSize[vertical], mMaxSize[vertical]);
|
||||
if (len != current.size()) {
|
||||
out.resizeFromCenter(len);
|
||||
}
|
||||
|
||||
return out;
|
||||
}
|
||||
|
||||
RectF Widget::getChildrenEnclosure() {
|
||||
RectF out;
|
||||
|
||||
if (mChildren.empty()) {
|
||||
out = { getAreaT().center(), { 0, 0 } };
|
||||
} else {
|
||||
for (auto child : mChildren) {
|
||||
out.expand(child->getAreaT());
|
||||
}
|
||||
out.pos += getAreaT().pos;
|
||||
}
|
||||
|
||||
return out;
|
||||
}
|
||||
|
||||
RectF Widget::getParentEnclosure() {
|
||||
DEBUG_ASSERT(mParent);
|
||||
if (!mParent) return { { 0, 0 }, mMaxSize };
|
||||
return mParent->getRelativeAreaT();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,13 +27,15 @@ namespace tp {
|
|||
RectF previewHandleArea = {};
|
||||
|
||||
ResizeHandle resizeHandle;
|
||||
|
||||
RectF areaBeforeDocking = {};
|
||||
};
|
||||
|
||||
public:
|
||||
DockLayoutWidget();
|
||||
|
||||
public:
|
||||
void adjustRect() override {}
|
||||
void pickRect() override {}
|
||||
void adjustChildrenRect() override {}
|
||||
|
||||
void process(const EventHandler& events) override;
|
||||
|
|
@ -47,10 +49,11 @@ namespace tp {
|
|||
void setCenterWidget(Widget* widget);
|
||||
|
||||
void dockWidget(Widget* widget, Side side);
|
||||
void undockWidget(Side side);
|
||||
void undockWidget(Side side, bool restoreArea = true);
|
||||
void toggleWidgetVisibility(Side side);
|
||||
|
||||
private:
|
||||
Side getSideFromWidget(Widget*);
|
||||
void calculateSideAreas();
|
||||
void calculateResizeHandles();
|
||||
void handleResizeEvents(const EventHandler& events);
|
||||
|
|
@ -86,9 +89,9 @@ namespace tp {
|
|||
RGBA mResizeHandleColorHovered = RGBA(0.3, 0.3, 0.3, 1);
|
||||
RGBA mResizeHandleColorActive = RGBA(0.6, 0.6, 0.6, 1);
|
||||
RGBA mBackgroundColor = RGBA(0, 0, 0, 1);
|
||||
RGBA mPreviewColor = RGBA(0.6, 0.6, 0.6, 1);
|
||||
RGBA mPreviewColor = RGBA(0.6, 0.6, 0.6, 0.2);
|
||||
|
||||
public:
|
||||
bool mPreview = false;
|
||||
Widget* mPreviewWidget = nullptr;
|
||||
};
|
||||
}
|
||||
|
|
@ -12,7 +12,7 @@ namespace tp {
|
|||
|
||||
void process(const EventHandler& events) override;
|
||||
|
||||
void adjustRect() override;
|
||||
void pickRect() override;
|
||||
|
||||
void draw(Canvas& canvas) override;
|
||||
|
||||
|
|
@ -20,6 +20,8 @@ namespace tp {
|
|||
|
||||
[[nodiscard]] bool propagateEventsToChildren() const override;
|
||||
|
||||
[[nodiscard]] bool isFloating() const;
|
||||
|
||||
private:
|
||||
bool mIsFloating = false;
|
||||
bool mIsResizing = false;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ namespace tp {
|
|||
// canvas.rect(getRelativeArea(), RGBA(0, 0, 0, 1));
|
||||
}
|
||||
|
||||
void adjustRect() override {
|
||||
void pickRect() override {
|
||||
// do nothing
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -51,5 +51,7 @@ namespace tp {
|
|||
Widget* mInFocusWidget = nullptr;
|
||||
|
||||
bool mDebug = true;
|
||||
bool mDebugStopProcessing = false;
|
||||
bool mDebugRedrawAlways = false;
|
||||
};
|
||||
}
|
||||
|
|
@ -13,6 +13,19 @@ namespace tp {
|
|||
class Widget {
|
||||
friend class RootWidget;
|
||||
|
||||
public:
|
||||
enum class SizePolicy {
|
||||
Passive,
|
||||
Expand,
|
||||
Contract,
|
||||
};
|
||||
|
||||
enum class LayoutPolicy {
|
||||
Passive,
|
||||
Vertically,
|
||||
Horizontally,
|
||||
};
|
||||
|
||||
public:
|
||||
Widget();
|
||||
virtual ~Widget() = default;
|
||||
|
|
@ -23,6 +36,7 @@ namespace tp {
|
|||
}
|
||||
|
||||
void addChild(Widget* child);
|
||||
void removeChild(Widget* child);
|
||||
|
||||
WidgetManagerInterface* getRoot();
|
||||
|
||||
|
|
@ -31,18 +45,33 @@ namespace tp {
|
|||
void bringToFront();
|
||||
void bringToBack();
|
||||
|
||||
void setSizePolicy(SizePolicy x, SizePolicy y);
|
||||
void setLayoutPolicy(LayoutPolicy layoutPolicy);
|
||||
|
||||
const Vec2F& getMinSize();
|
||||
void setMinSize(const Vec2F& size);
|
||||
|
||||
public:
|
||||
virtual void process(const EventHandler& events) {}
|
||||
virtual void draw(Canvas& canvas) { canvas.rect(mArea.getCurrentRect(), RGBA(1.f), 10); }
|
||||
virtual void draw(Canvas& canvas) {}
|
||||
virtual void drawOverlay(Canvas& canvas) {}
|
||||
|
||||
virtual void mouseEnter();
|
||||
virtual void mouseLeave();
|
||||
|
||||
// size policies
|
||||
virtual void adjustRect();
|
||||
virtual void pickRect();
|
||||
virtual void clampRect();
|
||||
virtual void adjustChildrenRect();
|
||||
|
||||
// resizing
|
||||
RangeF pickRange(const RangeF& current, const RangeF& children, const RangeF& parent, bool vertical);
|
||||
RangeF clampRange(const RangeF& current, const RangeF& children, const RangeF& parent, bool vertical);
|
||||
RectF getChildrenEnclosure();
|
||||
RectF getParentEnclosure();
|
||||
void adjustLayout(bool vertical);
|
||||
halnf changeChildSize(Widget*, halnf diff, bool vertical);
|
||||
|
||||
[[nodiscard]] virtual bool processesEvents() const;
|
||||
[[nodiscard]] virtual bool propagateEventsToChildren() const;
|
||||
|
||||
|
|
@ -53,7 +82,11 @@ namespace tp {
|
|||
|
||||
public:
|
||||
[[nodiscard]] RectF getArea() const;
|
||||
[[nodiscard]] RectF getAreaT() const;
|
||||
|
||||
[[nodiscard]] RectF getRelativeArea() const;
|
||||
[[nodiscard]] RectF getRelativeAreaT() const;
|
||||
|
||||
void setArea(const RectF& area);
|
||||
|
||||
protected:
|
||||
|
|
@ -65,6 +98,12 @@ namespace tp {
|
|||
// relative to the parent
|
||||
SpringRect mArea;
|
||||
|
||||
// resizing
|
||||
LayoutPolicy mLayoutPolicy = LayoutPolicy::Passive;
|
||||
Vec2<SizePolicy> mSizePolicy = { SizePolicy::Passive, SizePolicy::Passive };
|
||||
Vec2F mMinSize = { 50, 50 };
|
||||
Vec2F mMaxSize = { FLT_MAX / 2, FLT_MAX / 2 };
|
||||
|
||||
bool mInFocus = false;
|
||||
|
||||
// debug
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue