From 72101b343829cd6c8f179e007b22d33637262b80 Mon Sep 17 00:00:00 2001 From: Brayden Zee Date: Wed, 22 Jul 2026 08:00:28 -0400 Subject: [PATCH 1/6] layout: increment used space when an element must be shrunk or grown --- src/element/LinearLayout.hpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/element/LinearLayout.hpp b/src/element/LinearLayout.hpp index 6b5a875..2074452 100644 --- a/src/element/LinearLayout.hpp +++ b/src/element/LinearLayout.hpp @@ -113,17 +113,18 @@ namespace Hyprtoolkit::LinearLayout { // squeeze the last element in sizes.at(i) = MAX - used; + used = MAX; continue; } // can fit: use preferred sizes.at(i) = axisPrimary(cSize); child->impl->setFailedPositioning(false); - used += axisPrimary(cSize) + gap; + used += axisPrimary(cSize); + if (i != C.size() - 1) + used += gap; } - if (!C.empty()) - used -= gap; // grow the first element marked as growing on this axis to fill remaining space if (used < MAX) { @@ -131,6 +132,7 @@ namespace Hyprtoolkit::LinearLayout { if (!grows(C.at(i))) continue; sizes.at(i) += MAX - used; + used = MAX; break; } } From 3a2f69354a1fc43c9e00a51feb7522908adc71fb Mon Sep 17 00:00:00 2001 From: Brayden Zee Date: Sun, 2 Aug 2026 14:27:03 -0400 Subject: [PATCH 2/6] layout: limit child size to the parent size Previously the child got it's preferred size even if it was bigger than the parent. This should not happen, but it is possible with row or column layouts. This could be fixed in every case where an element misbehaves, but it is easiest to fix here. --- src/element/scrollArea/ScrollArea.cpp | 2 +- src/layout/Positioner.cpp | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/element/scrollArea/ScrollArea.cpp b/src/element/scrollArea/ScrollArea.cpp index 3fce328..8a60975 100644 --- a/src/element/scrollArea/ScrollArea.cpp +++ b/src/element/scrollArea/ScrollArea.cpp @@ -293,7 +293,7 @@ void CScrollAreaElement::reposition(const Hyprutils::Math::CBox& sbox, const Vec // move the whole content layer by the scroll offset, then lay it (and the scrollbar // strips) out. the strips carry no offset of their own, so they stay pinned to the edge. m_impl->inner->setAbsolutePosition(-m_impl->data.currentScroll.round()); - g_positioner->positionChildren(impl->self.lock()); + g_positioner->positionChildren(impl->self.lock(), { .growY = true }); // content is laid out at its natural size now, so this reads the real overflow. m_impl->recalcMaxScroll(); diff --git a/src/layout/Positioner.cpp b/src/layout/Positioner.cpp index 26d2b8f..cfdf22e 100644 --- a/src/layout/Positioner.cpp +++ b/src/layout/Positioner.cpp @@ -28,6 +28,7 @@ void CPositioner::position(SP element, const CBox& box, const Hyprutil void CPositioner::positionChildren(SP element, const SRepositionData& data) { const auto C = element->impl->children; const auto BOX = element->impl->position.copy().translate(data.offset); + const auto CLIP_BOX = CBox{BOX.pos(), {data.growX ? 99999999 : BOX.width, data.growY ? 99999999 : BOX.height}}; // position children according to how they wanna be positioned @@ -36,18 +37,12 @@ void CPositioner::positionChildren(SP element, const SRepositionData& if (!itemSize) { // no size to base off of, just position - CBox itemBox = BOX; - if (data.growX) - itemBox.w = 99999999; - if (data.growY) - itemBox.h = 99999999; - - position(c, itemBox); + position(c, CLIP_BOX); continue; } // it has a size, let's see what it wants. - CBox itemBox = {BOX.pos(), *itemSize}; + CBox itemBox = CBox{BOX.pos(), *itemSize}.intersection(CLIP_BOX); if (c->impl->positionMode == IElement::HT_POSITION_ABSOLUTE) { From 1f706aa0a0e45a8be1d1c1123a1587550435cf63 Mon Sep 17 00:00:00 2001 From: Brayden Zee Date: Fri, 24 Jul 2026 22:12:18 -0400 Subject: [PATCH 3/6] layout: report parent size to children correctly in preferred size This reports the parent size to the child of a layout, instead of directly reporting the layouts size. This is only reported if the size of the layout is automatic. This allows the layout to grow to the full size of the parent instead of staying in place. In order to prevent percent based elements from growing to the full size of the parent, a grow flag is added that stops percentage based sizes from applying. --- include/hyprtoolkit/element/Button.hpp | 2 +- include/hyprtoolkit/element/Checkbox.hpp | 2 +- include/hyprtoolkit/element/ColumnLayout.hpp | 2 +- include/hyprtoolkit/element/Combobox.hpp | 2 +- include/hyprtoolkit/element/Element.hpp | 2 +- include/hyprtoolkit/element/Image.hpp | 2 +- include/hyprtoolkit/element/Line.hpp | 2 +- include/hyprtoolkit/element/Null.hpp | 2 +- include/hyprtoolkit/element/ProgressBar.hpp | 2 +- include/hyprtoolkit/element/Rectangle.hpp | 2 +- include/hyprtoolkit/element/RowLayout.hpp | 2 +- include/hyprtoolkit/element/ScrollArea.hpp | 2 +- include/hyprtoolkit/element/Slider.hpp | 2 +- include/hyprtoolkit/element/Spinbox.hpp | 2 +- include/hyprtoolkit/element/Text.hpp | 2 +- include/hyprtoolkit/element/Textbox.hpp | 2 +- include/hyprtoolkit/types/SizeType.hpp | 4 +- src/element/Element.cpp | 20 ++++-- src/element/Element.hpp | 4 +- src/element/button/Button.cpp | 65 +++----------------- src/element/checkbox/Checkbox.cpp | 8 +-- src/element/checkbox/Checkbox.hpp | 2 +- src/element/checkbox/Checkmark.cpp | 6 +- src/element/columnLayout/ColumnLayout.cpp | 21 +++++-- src/element/combobox/Combobox.cpp | 6 +- src/element/combobox/Combobox.hpp | 2 +- src/element/combobox/DropdownHandle.cpp | 6 +- src/element/image/Image.cpp | 8 +-- src/element/line/Line.cpp | 6 +- src/element/null/Null.cpp | 6 +- src/element/progressBar/ProgressBar.cpp | 6 +- src/element/rectangle/Rectangle.cpp | 6 +- src/element/rowLayout/RowLayout.cpp | 19 ++++-- src/element/scrollArea/ScrollArea.cpp | 6 +- src/element/slider/Slider.cpp | 42 ++----------- src/element/spinbox/Spinbox.cpp | 42 ++----------- src/element/spinbox/Spinbox.hpp | 4 +- src/element/spinbox/SpinboxAngle.cpp | 6 +- src/element/spinbox/SpinboxSpinner.cpp | 6 +- src/element/text/Text.cpp | 4 +- src/element/textbox/Textbox.cpp | 6 +- src/types/SizeType.cpp | 16 ++++- src/window/WaylandWindow.cpp | 2 +- tests/Controls.cpp | 6 +- tests/unit/elements/Spinbox.cpp | 5 +- 45 files changed, 148 insertions(+), 224 deletions(-) diff --git a/include/hyprtoolkit/element/Button.hpp b/include/hyprtoolkit/element/Button.hpp index 2cb8857..bcc4dd7 100644 --- a/include/hyprtoolkit/element/Button.hpp +++ b/include/hyprtoolkit/element/Button.hpp @@ -64,7 +64,7 @@ namespace Hyprtoolkit { virtual void paint(); virtual void reposition(const Hyprutils::Math::CBox& box, const Hyprutils::Math::Vector2D& maxSize = {-1, -1}); - virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent); + virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true); virtual std::optional minimumSize(const Hyprutils::Math::Vector2D& parent); virtual std::optional maximumSize(const Hyprutils::Math::Vector2D& parent); virtual bool acceptsMouseInput(); diff --git a/include/hyprtoolkit/element/Checkbox.hpp b/include/hyprtoolkit/element/Checkbox.hpp index 7984158..d679f17 100644 --- a/include/hyprtoolkit/element/Checkbox.hpp +++ b/include/hyprtoolkit/element/Checkbox.hpp @@ -58,7 +58,7 @@ namespace Hyprtoolkit { virtual void paint(); virtual void reposition(const Hyprutils::Math::CBox& box, const Hyprutils::Math::Vector2D& maxSize = {-1, -1}); - virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent); + virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true); virtual std::optional minimumSize(const Hyprutils::Math::Vector2D& parent); virtual std::optional maximumSize(const Hyprutils::Math::Vector2D& parent); virtual bool acceptsMouseInput(); diff --git a/include/hyprtoolkit/element/ColumnLayout.hpp b/include/hyprtoolkit/element/ColumnLayout.hpp index 1de266e..36016f2 100644 --- a/include/hyprtoolkit/element/ColumnLayout.hpp +++ b/include/hyprtoolkit/element/ColumnLayout.hpp @@ -44,7 +44,7 @@ namespace Hyprtoolkit { virtual void paint(); virtual void reposition(const Hyprutils::Math::CBox& box, const Hyprutils::Math::Vector2D& maxSize = {-1, -1}); - virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent); + virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true); virtual std::optional minimumSize(const Hyprutils::Math::Vector2D& parent); virtual bool positioningDependsOnChild(); diff --git a/include/hyprtoolkit/element/Combobox.hpp b/include/hyprtoolkit/element/Combobox.hpp index 3b7a58b..10cbcd6 100644 --- a/include/hyprtoolkit/element/Combobox.hpp +++ b/include/hyprtoolkit/element/Combobox.hpp @@ -54,7 +54,7 @@ namespace Hyprtoolkit { virtual void paint(); virtual void reposition(const Hyprutils::Math::CBox& box, const Hyprutils::Math::Vector2D& maxSize = {-1, -1}); - virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent); + virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true); virtual std::optional minimumSize(const Hyprutils::Math::Vector2D& parent); virtual std::optional maximumSize(const Hyprutils::Math::Vector2D& parent); virtual bool acceptsMouseInput(); diff --git a/include/hyprtoolkit/element/Element.hpp b/include/hyprtoolkit/element/Element.hpp index f50a81a..da570bd 100644 --- a/include/hyprtoolkit/element/Element.hpp +++ b/include/hyprtoolkit/element/Element.hpp @@ -91,7 +91,7 @@ namespace Hyprtoolkit { /* Sizes for auto positioning in layouts */ virtual std::optional - preferredSize(const Hyprutils::Math::Vector2D& parent); + preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true); virtual std::optional minimumSize(const Hyprutils::Math::Vector2D& parent); virtual std::optional maximumSize(const Hyprutils::Math::Vector2D& parent); diff --git a/include/hyprtoolkit/element/Image.hpp b/include/hyprtoolkit/element/Image.hpp index c88bb2f..9774574 100644 --- a/include/hyprtoolkit/element/Image.hpp +++ b/include/hyprtoolkit/element/Image.hpp @@ -57,7 +57,7 @@ namespace Hyprtoolkit { // virtual void paint(); virtual void reposition(const Hyprutils::Math::CBox& box, const Hyprutils::Math::Vector2D& maxSize = {-1, -1}); - virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent); + virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true); virtual std::optional minimumSize(const Hyprutils::Math::Vector2D& parent); virtual std::optional maximumSize(const Hyprutils::Math::Vector2D& parent); virtual bool positioningDependsOnChild(); diff --git a/include/hyprtoolkit/element/Line.hpp b/include/hyprtoolkit/element/Line.hpp index b02de3d..88f93c0 100644 --- a/include/hyprtoolkit/element/Line.hpp +++ b/include/hyprtoolkit/element/Line.hpp @@ -49,7 +49,7 @@ namespace Hyprtoolkit { virtual void paint(); virtual void reposition(const Hyprutils::Math::CBox& box, const Hyprutils::Math::Vector2D& maxSize = {-1, -1}); - virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent); + virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true); virtual std::optional minimumSize(const Hyprutils::Math::Vector2D& parent); virtual std::optional maximumSize(const Hyprutils::Math::Vector2D& parent); virtual bool positioningDependsOnChild(); diff --git a/include/hyprtoolkit/element/Null.hpp b/include/hyprtoolkit/element/Null.hpp index 9c54e77..01a14e9 100644 --- a/include/hyprtoolkit/element/Null.hpp +++ b/include/hyprtoolkit/element/Null.hpp @@ -46,7 +46,7 @@ namespace Hyprtoolkit { virtual void paint(); virtual void reposition(const Hyprutils::Math::CBox& box, const Hyprutils::Math::Vector2D& maxSize = {-1, -1}); - virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent); + virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true); virtual std::optional minimumSize(const Hyprutils::Math::Vector2D& parent); virtual std::optional maximumSize(const Hyprutils::Math::Vector2D& parent); virtual bool positioningDependsOnChild(); diff --git a/include/hyprtoolkit/element/ProgressBar.hpp b/include/hyprtoolkit/element/ProgressBar.hpp index 8458d0b..da0b4f4 100644 --- a/include/hyprtoolkit/element/ProgressBar.hpp +++ b/include/hyprtoolkit/element/ProgressBar.hpp @@ -56,7 +56,7 @@ namespace Hyprtoolkit { virtual void paint(); virtual void reposition(const Hyprutils::Math::CBox& box, const Hyprutils::Math::Vector2D& maxSize = {-1, -1}); - virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent); + virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true); virtual std::optional minimumSize(const Hyprutils::Math::Vector2D& parent); virtual std::optional maximumSize(const Hyprutils::Math::Vector2D& parent); virtual bool positioningDependsOnChild(); diff --git a/include/hyprtoolkit/element/Rectangle.hpp b/include/hyprtoolkit/element/Rectangle.hpp index d673323..a6ddd84 100644 --- a/include/hyprtoolkit/element/Rectangle.hpp +++ b/include/hyprtoolkit/element/Rectangle.hpp @@ -54,7 +54,7 @@ namespace Hyprtoolkit { virtual void paint(); virtual void reposition(const Hyprutils::Math::CBox& box, const Hyprutils::Math::Vector2D& maxSize = {-1, -1}); - virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent); + virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true); virtual std::optional minimumSize(const Hyprutils::Math::Vector2D& parent); virtual std::optional maximumSize(const Hyprutils::Math::Vector2D& parent); virtual bool positioningDependsOnChild(); diff --git a/include/hyprtoolkit/element/RowLayout.hpp b/include/hyprtoolkit/element/RowLayout.hpp index dbe1996..a305c41 100644 --- a/include/hyprtoolkit/element/RowLayout.hpp +++ b/include/hyprtoolkit/element/RowLayout.hpp @@ -43,7 +43,7 @@ namespace Hyprtoolkit { virtual void paint(); virtual void reposition(const Hyprutils::Math::CBox& box, const Hyprutils::Math::Vector2D& maxSize = {-1, -1}); - virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent); + virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true); virtual std::optional minimumSize(const Hyprutils::Math::Vector2D& parent); virtual bool positioningDependsOnChild(); Hyprutils::Math::Vector2D childSize(Hyprutils::Memory::CSharedPointer child); diff --git a/include/hyprtoolkit/element/ScrollArea.hpp b/include/hyprtoolkit/element/ScrollArea.hpp index d93f5f2..230852e 100644 --- a/include/hyprtoolkit/element/ScrollArea.hpp +++ b/include/hyprtoolkit/element/ScrollArea.hpp @@ -60,7 +60,7 @@ namespace Hyprtoolkit { virtual void paint(); virtual void reposition(const Hyprutils::Math::CBox& box, const Hyprutils::Math::Vector2D& maxSize = {-1, -1}); - virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent); + virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true); virtual std::optional minimumSize(const Hyprutils::Math::Vector2D& parent); virtual bool acceptsMouseInput(); virtual bool alwaysGetMouseInput(); diff --git a/include/hyprtoolkit/element/Slider.hpp b/include/hyprtoolkit/element/Slider.hpp index 5cc5ba6..c0e6508 100644 --- a/include/hyprtoolkit/element/Slider.hpp +++ b/include/hyprtoolkit/element/Slider.hpp @@ -54,7 +54,7 @@ namespace Hyprtoolkit { virtual void paint(); virtual void reposition(const Hyprutils::Math::CBox& box, const Hyprutils::Math::Vector2D& maxSize = {-1, -1}); - virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent); + virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true); virtual std::optional minimumSize(const Hyprutils::Math::Vector2D& parent); virtual std::optional maximumSize(const Hyprutils::Math::Vector2D& parent); virtual bool acceptsMouseInput(); diff --git a/include/hyprtoolkit/element/Spinbox.hpp b/include/hyprtoolkit/element/Spinbox.hpp index 1ba33e4..c5de52a 100644 --- a/include/hyprtoolkit/element/Spinbox.hpp +++ b/include/hyprtoolkit/element/Spinbox.hpp @@ -58,7 +58,7 @@ namespace Hyprtoolkit { virtual void paint(); virtual void reposition(const Hyprutils::Math::CBox& box, const Hyprutils::Math::Vector2D& maxSize = {-1, -1}); - virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent); + virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true); virtual std::optional minimumSize(const Hyprutils::Math::Vector2D& parent); virtual std::optional maximumSize(const Hyprutils::Math::Vector2D& parent); virtual bool acceptsMouseInput(); diff --git a/include/hyprtoolkit/element/Text.hpp b/include/hyprtoolkit/element/Text.hpp index 85e3cfb..f580acb 100644 --- a/include/hyprtoolkit/element/Text.hpp +++ b/include/hyprtoolkit/element/Text.hpp @@ -64,7 +64,7 @@ namespace Hyprtoolkit { virtual void paint(); virtual void reposition(const Hyprutils::Math::CBox& box, const Hyprutils::Math::Vector2D& maxSize = {-1, -1}); - virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent); + virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true); virtual std::optional minimumSize(const Hyprutils::Math::Vector2D& parent); virtual std::optional maximumSize(const Hyprutils::Math::Vector2D& parent); virtual bool positioningDependsOnChild(); diff --git a/include/hyprtoolkit/element/Textbox.hpp b/include/hyprtoolkit/element/Textbox.hpp index 91d524d..ec3d0d7 100644 --- a/include/hyprtoolkit/element/Textbox.hpp +++ b/include/hyprtoolkit/element/Textbox.hpp @@ -59,7 +59,7 @@ namespace Hyprtoolkit { virtual void paint(); virtual void reposition(const Hyprutils::Math::CBox& box, const Hyprutils::Math::Vector2D& maxSize = {-1, -1}); - virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent); + virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true); virtual std::optional minimumSize(const Hyprutils::Math::Vector2D& parent); virtual std::optional maximumSize(const Hyprutils::Math::Vector2D& parent); virtual bool acceptsMouseInput(); diff --git a/include/hyprtoolkit/types/SizeType.hpp b/include/hyprtoolkit/types/SizeType.hpp index 7ad95fa..a8d8d82 100644 --- a/include/hyprtoolkit/types/SizeType.hpp +++ b/include/hyprtoolkit/types/SizeType.hpp @@ -16,7 +16,7 @@ namespace Hyprtoolkit { CDynamicSize(eSizingType typeX, eSizingType typeY, const Hyprutils::Math::Vector2D& size); - Hyprutils::Math::Vector2D calculate(Hyprutils::Math::Vector2D elSize) const; + Hyprutils::Math::Vector2D calculate(Hyprutils::Math::Vector2D elSize, bool grow = true) const; HT_HIDDEN : @@ -27,4 +27,4 @@ namespace Hyprtoolkit { eSizingType m_typeX = HT_SIZE_ABSOLUTE, m_typeY = HT_SIZE_ABSOLUTE; Hyprutils::Math::Vector2D m_value; }; -} \ No newline at end of file +} diff --git a/src/element/Element.cpp b/src/element/Element.cpp index 5928e49..46d7147 100644 --- a/src/element/Element.cpp +++ b/src/element/Element.cpp @@ -99,7 +99,7 @@ void IElement::setTooltip(std::string&& x) { impl->hasTooltip = !impl->tooltip.empty(); } -std::optional IElement::preferredSize(const Hyprutils::Math::Vector2D& parent) { +std::optional IElement::preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow) { return std::nullopt; } @@ -536,10 +536,10 @@ void SElementInternalData::setFailedPositioning(bool set) { breadthfirst([set](SP e) { e->impl->failedPositioning = set; }); } -Vector2D SElementInternalData::maxChildSize(const Vector2D& parent) { +Vector2D SElementInternalData::maxChildSize(const Vector2D& parent, bool grow) { Vector2D max; for (const auto& e : children) { - auto size = e->preferredSize(parent); + auto size = e->preferredSize(parent, grow); if (!size) size = e->minimumSize(parent); @@ -552,11 +552,19 @@ Vector2D SElementInternalData::maxChildSize(const Vector2D& parent) { return max + Vector2D{margin * 2, margin * 2}; } -Vector2D SElementInternalData::getPreferredSizeGeneric(const CDynamicSize& size, const Vector2D& parent) { - auto s = size.calculate(parent); +Vector2D SElementInternalData::getPreferredSizeGeneric(const CDynamicSize& size, const Vector2D& parent, bool grow) { + auto s = size.calculate(parent, grow); if (s.x != -1 && s.y != -1) return s; - auto max = maxChildSize(parent - Vector2D{margin * 2, margin * 2}); + + auto parentForChild = parent - Vector2D{margin * 2, margin * 2}; + if (s.x != -1) + parentForChild.x = s.x; + if (s.y != -1) + parentForChild.y = s.y; + + // We never want percent children to drive the preferred size of their parent. + auto max = maxChildSize(parentForChild, false); if (s.x == -1) s.x = max.x; if (s.y == -1) diff --git a/src/element/Element.hpp b/src/element/Element.hpp index 3cb2706..ee2a85c 100644 --- a/src/element/Element.hpp +++ b/src/element/Element.hpp @@ -98,8 +98,8 @@ namespace Hyprtoolkit { float effectiveOpacity() const; bool hasActiveGeometry() const; void setFailedPositioning(bool set); - Hyprutils::Math::Vector2D maxChildSize(const Hyprutils::Math::Vector2D& parent); - Hyprutils::Math::Vector2D getPreferredSizeGeneric(const CDynamicSize& size, const Hyprutils::Math::Vector2D& parent); + Hyprutils::Math::Vector2D maxChildSize(const Hyprutils::Math::Vector2D& parent, bool grow); + Hyprutils::Math::Vector2D getPreferredSizeGeneric(const CDynamicSize& size, const Hyprutils::Math::Vector2D& parent, bool grow); }; } diff --git a/src/element/button/Button.cpp b/src/element/button/Button.cpp index 705607e..7ce12d5 100644 --- a/src/element/button/Button.cpp +++ b/src/element/button/Button.cpp @@ -12,7 +12,7 @@ using namespace Hyprtoolkit; using namespace Hyprgraphics; -constexpr double BUTTON_PAD = 5; +constexpr double BUTTON_PAD = 7; static CHyprColor buttonColor(const SButtonImpl& impl) { if (impl.data.accent) @@ -58,8 +58,7 @@ CButtonElement::CButtonElement(const SButtonData& data) : IElement(), m_impl(mak c.a *= 0.5F; return c; }) - ->size(m_impl->data.ellipsize ? CDynamicSize{CDynamicSize::HT_SIZE_PERCENT, CDynamicSize::HT_SIZE_AUTO, {1.F, 1.F}} : - CDynamicSize{CDynamicSize::HT_SIZE_AUTO, CDynamicSize::HT_SIZE_AUTO, {1.F, 1.F}}) + ->size({CDynamicSize::HT_SIZE_AUTO, CDynamicSize::HT_SIZE_AUTO, {1.F, 1.F}}) ->align(m_impl->data.alignText) ->callback([this] { m_impl->labelChanged = true; @@ -77,7 +76,7 @@ CButtonElement::CButtonElement(const SButtonData& data) : IElement(), m_impl(mak addChild(m_impl->background); m_impl->background->addChild(m_impl->label); - m_impl->label->setMargin(2); + m_impl->label->setMargin(BUTTON_PAD); impl->m_externalEvents.mouseEnter.listenStatic([this](const Vector2D& pos) { if (!m_impl->data.enabled) @@ -115,20 +114,6 @@ void CButtonElement::reposition(const Hyprutils::Math::CBox& box, const Hyprutil IElement::reposition(box); g_positioner->positionChildren(impl->self.lock()); - - // positionChildren gives an absolute-positioned label its full preferred width - // and no maxSize, so a long label overflows. when ellipsize is requested, clamp - // the label box to the button's inner width and re-position with that as maxSize - // so the text element ellipsizes instead of spilling past the background. - if (m_impl->data.ellipsize && m_impl->label) { - const double INNER_W = std::max(0.0, impl->position.w - BUTTON_PAD * 2); - auto lbox = m_impl->label->impl->position; - if (lbox.w > INNER_W) { - lbox.x = impl->position.x + BUTTON_PAD; - lbox.w = INNER_W; - g_positioner->position(m_impl->label, lbox, Vector2D{INNER_W, lbox.h}); - } - } } void CButtonElement::setLabel(std::string label) { @@ -179,8 +164,6 @@ void CButtonElement::replaceData(const SButtonData& data) { c.a *= 0.5F; return c; }) - ->size(data.ellipsize ? CDynamicSize{CDynamicSize::HT_SIZE_PERCENT, CDynamicSize::HT_SIZE_AUTO, {1.F, 1.F}} : - CDynamicSize{CDynamicSize::HT_SIZE_AUTO, CDynamicSize::HT_SIZE_AUTO, {1.F, 1.F}}) ->align(data.alignText) ->noEllipsize(!data.ellipsize) ->commence(); @@ -199,50 +182,16 @@ Hyprutils::Math::Vector2D CButtonElement::size() { return impl->position.size(); } -std::optional CButtonElement::preferredSize(const Hyprutils::Math::Vector2D& parent) { - auto s = m_impl->data.size.calculate(parent); - - if (s.x != -1 && s.y != -1) - return s; - - const auto CALC = m_impl->label->preferredSize(parent).value() + Vector2D{BUTTON_PAD * 2, BUTTON_PAD * 2}; - - if (s.x == -1) - s.x = CALC.x; - if (s.y == -1) - s.y = CALC.y; - - return s; +std::optional CButtonElement::preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow) { + return impl->getPreferredSizeGeneric(m_impl->data.size, parent, grow); } std::optional CButtonElement::minimumSize(const Hyprutils::Math::Vector2D& parent) { - auto s = m_impl->data.size.calculate(parent); - if (s.x != -1 && s.y != -1) - return s; - - const auto CALC = m_impl->label->preferredSize(parent).value() + Vector2D{BUTTON_PAD * 2, BUTTON_PAD * 2}; - - if (s.x == -1) - s.x = CALC.x; - if (s.y == -1) - s.y = CALC.y; - - return s; + return impl->getPreferredSizeGeneric(m_impl->data.size, parent, false); } std::optional CButtonElement::maximumSize(const Hyprutils::Math::Vector2D& parent) { - auto s = m_impl->data.size.calculate(parent); - if (s.x != -1 && s.y != -1) - return s; - - const auto CALC = m_impl->label->preferredSize(parent).value() + Vector2D{BUTTON_PAD * 2, BUTTON_PAD * 2}; - - if (s.x == -1) - s.x = CALC.x; - if (s.y == -1) - s.y = CALC.y; - - return s; + return impl->getPreferredSizeGeneric(m_impl->data.size, parent, true); } bool CButtonElement::acceptsMouseInput() { diff --git a/src/element/checkbox/Checkbox.cpp b/src/element/checkbox/Checkbox.cpp index d914653..dcbd32e 100644 --- a/src/element/checkbox/Checkbox.cpp +++ b/src/element/checkbox/Checkbox.cpp @@ -167,16 +167,16 @@ Hyprutils::Math::Vector2D CCheckboxElement::size() { return impl->position.size(); } -std::optional CCheckboxElement::preferredSize(const Hyprutils::Math::Vector2D& parent) { - return impl->getPreferredSizeGeneric(m_impl->data.size, parent); +std::optional CCheckboxElement::preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow) { + return impl->getPreferredSizeGeneric(m_impl->data.size, parent, grow); } std::optional CCheckboxElement::minimumSize(const Hyprutils::Math::Vector2D& parent) { - return impl->getPreferredSizeGeneric(m_impl->data.size, parent); + return impl->getPreferredSizeGeneric(m_impl->data.size, parent, false); } std::optional CCheckboxElement::maximumSize(const Hyprutils::Math::Vector2D& parent) { - return impl->getPreferredSizeGeneric(m_impl->data.size, parent); + return impl->getPreferredSizeGeneric(m_impl->data.size, parent, true); } bool CCheckboxElement::acceptsMouseInput() { diff --git a/src/element/checkbox/Checkbox.hpp b/src/element/checkbox/Checkbox.hpp index e1e4d5e..3d070cb 100644 --- a/src/element/checkbox/Checkbox.hpp +++ b/src/element/checkbox/Checkbox.hpp @@ -27,7 +27,7 @@ namespace Hyprtoolkit { virtual void recheckColor(); virtual void reposition(const Hyprutils::Math::CBox& box, const Hyprutils::Math::Vector2D& maxSize = {-1, -1}); virtual Hyprutils::Math::Vector2D size(); - virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent); + virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true); virtual std::optional minimumSize(const Hyprutils::Math::Vector2D& parent); virtual std::optional maximumSize(const Hyprutils::Math::Vector2D& parent); diff --git a/src/element/checkbox/Checkmark.cpp b/src/element/checkbox/Checkmark.cpp index c7a03c4..538ec0b 100644 --- a/src/element/checkbox/Checkmark.cpp +++ b/src/element/checkbox/Checkmark.cpp @@ -46,12 +46,12 @@ Hyprutils::Math::Vector2D CCheckmarkElement::size() { return impl->position.size(); } -std::optional CCheckmarkElement::preferredSize(const Hyprutils::Math::Vector2D& parent) { - return m_data.size.calculate(parent); +std::optional CCheckmarkElement::preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow) { + return m_data.size.calculate(parent, grow); } std::optional CCheckmarkElement::minimumSize(const Hyprutils::Math::Vector2D& parent) { - return m_data.size.calculate(parent); + return m_data.size.calculate(parent, false); } std::optional CCheckmarkElement::maximumSize(const Hyprutils::Math::Vector2D& parent) { diff --git a/src/element/columnLayout/ColumnLayout.cpp b/src/element/columnLayout/ColumnLayout.cpp index aac676e..ea424b8 100644 --- a/src/element/columnLayout/ColumnLayout.cpp +++ b/src/element/columnLayout/ColumnLayout.cpp @@ -58,16 +58,29 @@ Hyprutils::Math::Vector2D CColumnLayoutElement::childSize(Hyprutils::Memory::CSh return {-1, -1}; } -std::optional CColumnLayoutElement::preferredSize(const Hyprutils::Math::Vector2D& parent) { - auto calc = m_impl->data.size.calculate(parent); +std::optional CColumnLayoutElement::preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow) { + auto calc = m_impl->data.size.calculate(parent, grow); if (calc.x != -1 && calc.y != -1) return calc; + Vector2D parentForChild = parent; + parentForChild.x -= impl->margin * 2; + parentForChild.y -= impl->margin * 2; + + if (calc.x != -1) + parentForChild.x = calc.x; + if (calc.y != -1) + parentForChild.y = calc.y; + + Vector2D max; for (const auto& child : impl->children) { - max.x = std::max(childSize(child).x, max.x); - max.y += childSize(child).y + m_impl->data.gap; + // We never want percent children to drive the preferred size of their parent. + Vector2D childPref = child->preferredSize(parentForChild, false).value_or({ 0, 0 }); + + max.x = std::max(max.x, childPref.x); + max.y += childPref.y + m_impl->data.gap; } if (!impl->children.empty()) diff --git a/src/element/combobox/Combobox.cpp b/src/element/combobox/Combobox.cpp index ef006f8..8567451 100644 --- a/src/element/combobox/Combobox.cpp +++ b/src/element/combobox/Combobox.cpp @@ -272,12 +272,12 @@ Hyprutils::Math::Vector2D CComboboxElement::size() { return impl->position.size(); } -std::optional CComboboxElement::preferredSize(const Hyprutils::Math::Vector2D& parent) { - return m_impl->data.size.calculate(parent); +std::optional CComboboxElement::preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow) { + return m_impl->data.size.calculate(parent, grow); } std::optional CComboboxElement::minimumSize(const Hyprutils::Math::Vector2D& parent) { - return m_impl->data.size.calculate(parent); + return m_impl->data.size.calculate(parent, false); } std::optional CComboboxElement::maximumSize(const Hyprutils::Math::Vector2D& parent) { diff --git a/src/element/combobox/Combobox.hpp b/src/element/combobox/Combobox.hpp index a9acf5a..2d79c03 100644 --- a/src/element/combobox/Combobox.hpp +++ b/src/element/combobox/Combobox.hpp @@ -34,7 +34,7 @@ namespace Hyprtoolkit { virtual void paint(); virtual void reposition(const Hyprutils::Math::CBox& box, const Hyprutils::Math::Vector2D& maxSize = {-1, -1}); virtual Hyprutils::Math::Vector2D size(); - virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent); + virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true); virtual std::optional minimumSize(const Hyprutils::Math::Vector2D& parent); virtual std::optional maximumSize(const Hyprutils::Math::Vector2D& parent); diff --git a/src/element/combobox/DropdownHandle.cpp b/src/element/combobox/DropdownHandle.cpp index 0257286..4e73d9f 100644 --- a/src/element/combobox/DropdownHandle.cpp +++ b/src/element/combobox/DropdownHandle.cpp @@ -40,12 +40,12 @@ Hyprutils::Math::Vector2D CDropdownHandleElement::size() { return impl->position.size(); } -std::optional CDropdownHandleElement::preferredSize(const Hyprutils::Math::Vector2D& parent) { - return m_data.size.calculate(parent); +std::optional CDropdownHandleElement::preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow) { + return m_data.size.calculate(parent, grow); } std::optional CDropdownHandleElement::minimumSize(const Hyprutils::Math::Vector2D& parent) { - return m_data.size.calculate(parent); + return m_data.size.calculate(parent, false); } std::optional CDropdownHandleElement::maximumSize(const Hyprutils::Math::Vector2D& parent) { diff --git a/src/element/image/Image.cpp b/src/element/image/Image.cpp index ac91783..255e5c4 100644 --- a/src/element/image/Image.cpp +++ b/src/element/image/Image.cpp @@ -238,8 +238,8 @@ Hyprutils::Math::Vector2D CImageElement::size() { return impl->position.size(); } -std::optional CImageElement::preferredSize(const Hyprutils::Math::Vector2D& parent) { - auto s = m_impl->data.size.calculate(parent); +std::optional CImageElement::preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow) { + auto s = m_impl->data.size.calculate(parent, grow); if (s.x != -1 && s.y != -1) return s; @@ -249,7 +249,7 @@ std::optional CImageElement::preferredSize(const Hyprutils::Math::Vect return m_impl->size / SCALE; if (m_impl->size.y == 0) - return impl->getPreferredSizeGeneric(m_impl->data.size, parent); + return impl->getPreferredSizeGeneric(m_impl->data.size, parent, grow); const double ASPECT_RATIO = m_impl->size.x / m_impl->size.y; @@ -260,7 +260,7 @@ std::optional CImageElement::preferredSize(const Hyprutils::Math::Vect } std::optional CImageElement::minimumSize(const Hyprutils::Math::Vector2D& parent) { - auto s = m_impl->data.size.calculate(parent); + auto s = m_impl->data.size.calculate(parent, false); if (s.x != -1 && s.y != -1) return s; return Vector2D{0, 0}; diff --git a/src/element/line/Line.cpp b/src/element/line/Line.cpp index f0da13b..b2c41c4 100644 --- a/src/element/line/Line.cpp +++ b/src/element/line/Line.cpp @@ -57,12 +57,12 @@ Hyprutils::Math::Vector2D CLineElement::size() { return impl->position.size(); } -std::optional CLineElement::preferredSize(const Hyprutils::Math::Vector2D& parent) { - return impl->getPreferredSizeGeneric(m_impl->data.size, parent); +std::optional CLineElement::preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow) { + return impl->getPreferredSizeGeneric(m_impl->data.size, parent, grow); } std::optional CLineElement::minimumSize(const Hyprutils::Math::Vector2D& parent) { - auto s = m_impl->data.size.calculate(parent); + auto s = m_impl->data.size.calculate(parent, false); if (s.x != -1 && s.y != -1) return s; return Vector2D{0, 0}; diff --git a/src/element/null/Null.cpp b/src/element/null/Null.cpp index 282f1ca..d33b201 100644 --- a/src/element/null/Null.cpp +++ b/src/element/null/Null.cpp @@ -48,12 +48,12 @@ Hyprutils::Math::Vector2D CNullElement::size() { return impl->position.size(); } -std::optional CNullElement::preferredSize(const Hyprutils::Math::Vector2D& parent) { - return impl->getPreferredSizeGeneric(m_impl->data.size, parent); +std::optional CNullElement::preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow) { + return impl->getPreferredSizeGeneric(m_impl->data.size, parent, grow); } std::optional CNullElement::minimumSize(const Hyprutils::Math::Vector2D& parent) { - auto s = m_impl->data.size.calculate(parent); + auto s = m_impl->data.size.calculate(parent, false); if (s.x != -1 && s.y != -1) return s; return Vector2D{0, 0}; diff --git a/src/element/progressBar/ProgressBar.cpp b/src/element/progressBar/ProgressBar.cpp index 9ea8f0a..fbb2399 100644 --- a/src/element/progressBar/ProgressBar.cpp +++ b/src/element/progressBar/ProgressBar.cpp @@ -146,12 +146,12 @@ Hyprutils::Math::Vector2D CProgressBarElement::size() { return impl->position.size(); } -std::optional CProgressBarElement::preferredSize(const Hyprutils::Math::Vector2D& parent) { - return m_impl->data.size.calculate(parent); +std::optional CProgressBarElement::preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow) { + return m_impl->data.size.calculate(parent, grow); } std::optional CProgressBarElement::minimumSize(const Hyprutils::Math::Vector2D& parent) { - return m_impl->data.size.calculate(parent); + return m_impl->data.size.calculate(parent, false); } std::optional CProgressBarElement::maximumSize(const Hyprutils::Math::Vector2D& parent) { diff --git a/src/element/rectangle/Rectangle.cpp b/src/element/rectangle/Rectangle.cpp index 4022192..0e9df01 100644 --- a/src/element/rectangle/Rectangle.cpp +++ b/src/element/rectangle/Rectangle.cpp @@ -137,12 +137,12 @@ Hyprutils::Math::Vector2D CRectangleElement::size() { return impl->position.size(); } -std::optional CRectangleElement::preferredSize(const Hyprutils::Math::Vector2D& parent) { - return impl->getPreferredSizeGeneric(m_impl->data.size, parent); +std::optional CRectangleElement::preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow) { + return impl->getPreferredSizeGeneric(m_impl->data.size, parent, grow); } std::optional CRectangleElement::minimumSize(const Hyprutils::Math::Vector2D& parent) { - auto s = m_impl->data.size.calculate(parent); + auto s = m_impl->data.size.calculate(parent, false); if (s.x != -1 && s.y != -1) return s; return Vector2D{0, 0}; diff --git a/src/element/rowLayout/RowLayout.cpp b/src/element/rowLayout/RowLayout.cpp index 64f6a29..b4ce0ff 100644 --- a/src/element/rowLayout/RowLayout.cpp +++ b/src/element/rowLayout/RowLayout.cpp @@ -58,16 +58,27 @@ Hyprutils::Math::Vector2D CRowLayoutElement::size() { return impl->position.size(); } -std::optional CRowLayoutElement::preferredSize(const Hyprutils::Math::Vector2D& parent) { - auto calc = m_impl->data.size.calculate(parent); +std::optional CRowLayoutElement::preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow) { + auto calc = m_impl->data.size.calculate(parent, grow); if (calc.x != -1 && calc.y != -1) return calc; + Vector2D parentForChild = parent; + parentForChild.x -= impl->margin * 2; + parentForChild.y -= impl->margin * 2; + + if (calc.x != -1) + parentForChild.x = calc.x; + if (calc.y != -1) + parentForChild.y = calc.y; + Vector2D max; for (const auto& child : impl->children) { - max.x += childSize(child).x + m_impl->data.gap; - max.y = std::max(max.y, childSize(child).y); + // We never want percent children to drive the preferred size of their parent. + Vector2D childPref = child->preferredSize(parentForChild, false).value_or({ 0, 0 }); + max.x += childPref.x + m_impl->data.gap; + max.y = std::max(max.y, childPref.y); } if (!impl->children.empty()) diff --git a/src/element/scrollArea/ScrollArea.cpp b/src/element/scrollArea/ScrollArea.cpp index 8a60975..1e05989 100644 --- a/src/element/scrollArea/ScrollArea.cpp +++ b/src/element/scrollArea/ScrollArea.cpp @@ -293,7 +293,7 @@ void CScrollAreaElement::reposition(const Hyprutils::Math::CBox& sbox, const Vec // move the whole content layer by the scroll offset, then lay it (and the scrollbar // strips) out. the strips carry no offset of their own, so they stay pinned to the edge. m_impl->inner->setAbsolutePosition(-m_impl->data.currentScroll.round()); - g_positioner->positionChildren(impl->self.lock(), { .growY = true }); + g_positioner->positionChildren(impl->self.lock(), {.growX = m_impl->data.scrollX, .growY = m_impl->data.scrollY}); // content is laid out at its natural size now, so this reads the real overflow. m_impl->recalcMaxScroll(); @@ -324,8 +324,8 @@ void CScrollAreaElement::setScroll(const Hyprutils::Math::Vector2D& x) { impl->window->scheduleReposition(impl->self); } -std::optional CScrollAreaElement::preferredSize(const Vector2D& parent) { - return impl->getPreferredSizeGeneric(m_impl->data.size, parent); +std::optional CScrollAreaElement::preferredSize(const Vector2D& parent, bool grow) { + return impl->getPreferredSizeGeneric(m_impl->data.size, parent, grow); } std::optional CScrollAreaElement::minimumSize(const Vector2D& parent) { diff --git a/src/element/slider/Slider.cpp b/src/element/slider/Slider.cpp index 713710d..9b78141 100644 --- a/src/element/slider/Slider.cpp +++ b/src/element/slider/Slider.cpp @@ -207,50 +207,16 @@ Hyprutils::Math::Vector2D CSliderElement::size() { return impl->position.size(); } -std::optional CSliderElement::preferredSize(const Hyprutils::Math::Vector2D& parent) { - auto s = m_impl->data.size.calculate(parent); - - if (s.x != -1 && s.y != -1) - return s; - - const auto CALC = m_impl->layout->preferredSize(parent).value() + Vector2D{1, 1}; - - if (s.x == -1) - s.x = CALC.x; - if (s.y == -1) - s.y = CALC.y; - - return s; +std::optional CSliderElement::preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow) { + return impl->getPreferredSizeGeneric(m_impl->data.size, parent, grow); } std::optional CSliderElement::minimumSize(const Hyprutils::Math::Vector2D& parent) { - auto s = m_impl->data.size.calculate(parent); - if (s.x != -1 && s.y != -1) - return s; - - const auto CALC = m_impl->layout->preferredSize(parent).value() + Vector2D{1, 1}; - - if (s.x == -1) - s.x = CALC.x; - if (s.y == -1) - s.y = CALC.y; - - return s; + return impl->getPreferredSizeGeneric(m_impl->data.size, parent, false); } std::optional CSliderElement::maximumSize(const Hyprutils::Math::Vector2D& parent) { - auto s = m_impl->data.size.calculate(parent); - if (s.x != -1 && s.y != -1) - return s; - - const auto CALC = m_impl->layout->preferredSize(parent).value() + Vector2D{1, 1}; - - if (s.x == -1) - s.x = CALC.x; - if (s.y == -1) - s.y = CALC.y; - - return s; + return impl->getPreferredSizeGeneric(m_impl->data.size, parent, true); } bool CSliderElement::acceptsMouseInput() { diff --git a/src/element/spinbox/Spinbox.cpp b/src/element/spinbox/Spinbox.cpp index fb4380a..2b67bb1 100644 --- a/src/element/spinbox/Spinbox.cpp +++ b/src/element/spinbox/Spinbox.cpp @@ -101,50 +101,16 @@ Hyprutils::Math::Vector2D CSpinboxElement::size() { return impl->position.size(); } -std::optional CSpinboxElement::preferredSize(const Hyprutils::Math::Vector2D& parent) { - auto s = m_impl->data.size.calculate(parent); - - if (s.x != -1 && s.y != -1) - return s; - - const auto CALC = m_impl->layout->preferredSize(parent).value() + Vector2D{1, 1}; - - if (s.x == -1) - s.x = CALC.x; - if (s.y == -1) - s.y = CALC.y; - - return s; +std::optional CSpinboxElement::preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow) { + return impl->getPreferredSizeGeneric(m_impl->data.size, parent, grow); } std::optional CSpinboxElement::minimumSize(const Hyprutils::Math::Vector2D& parent) { - auto s = m_impl->data.size.calculate(parent); - if (s.x != -1 && s.y != -1) - return s; - - const auto CALC = m_impl->layout->preferredSize(parent).value() + Vector2D{1, 1}; - - if (s.x == -1) - s.x = CALC.x; - if (s.y == -1) - s.y = CALC.y; - - return s; + return impl->getPreferredSizeGeneric(m_impl->data.size, parent, false); } std::optional CSpinboxElement::maximumSize(const Hyprutils::Math::Vector2D& parent) { - auto s = m_impl->data.size.calculate(parent); - if (s.x != -1 && s.y != -1) - return s; - - const auto CALC = m_impl->layout->preferredSize(parent).value() + Vector2D{1, 1}; - - if (s.x == -1) - s.x = CALC.x; - if (s.y == -1) - s.y = CALC.y; - - return s; + return impl->getPreferredSizeGeneric(m_impl->data.size, parent, true); } bool CSpinboxElement::acceptsMouseInput() { diff --git a/src/element/spinbox/Spinbox.hpp b/src/element/spinbox/Spinbox.hpp index 4c90511..307ebf7 100644 --- a/src/element/spinbox/Spinbox.hpp +++ b/src/element/spinbox/Spinbox.hpp @@ -32,7 +32,7 @@ namespace Hyprtoolkit { virtual void paint(); virtual void reposition(const Hyprutils::Math::CBox& box, const Hyprutils::Math::Vector2D& maxSize = {-1, -1}); virtual Hyprutils::Math::Vector2D size(); - virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent); + virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true); virtual std::optional minimumSize(const Hyprutils::Math::Vector2D& parent); virtual std::optional maximumSize(const Hyprutils::Math::Vector2D& parent); virtual bool acceptsMouseInput(); @@ -69,7 +69,7 @@ namespace Hyprtoolkit { virtual void paint(); virtual void reposition(const Hyprutils::Math::CBox& box, const Hyprutils::Math::Vector2D& maxSize = {-1, -1}); virtual Hyprutils::Math::Vector2D size(); - virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent); + virtual std::optional preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true); virtual std::optional minimumSize(const Hyprutils::Math::Vector2D& parent); virtual std::optional maximumSize(const Hyprutils::Math::Vector2D& parent); virtual bool acceptsMouseInput(); diff --git a/src/element/spinbox/SpinboxAngle.cpp b/src/element/spinbox/SpinboxAngle.cpp index 2f21a70..5d07ed9 100644 --- a/src/element/spinbox/SpinboxAngle.cpp +++ b/src/element/spinbox/SpinboxAngle.cpp @@ -67,12 +67,12 @@ Hyprutils::Math::Vector2D CSpinboxAngleElement::size() { return impl->position.size(); } -std::optional CSpinboxAngleElement::preferredSize(const Hyprutils::Math::Vector2D& parent) { - return m_data.size.calculate(parent); +std::optional CSpinboxAngleElement::preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow) { + return m_data.size.calculate(parent, grow); } std::optional CSpinboxAngleElement::minimumSize(const Hyprutils::Math::Vector2D& parent) { - return m_data.size.calculate(parent); + return m_data.size.calculate(parent, false); } std::optional CSpinboxAngleElement::maximumSize(const Hyprutils::Math::Vector2D& parent) { diff --git a/src/element/spinbox/SpinboxSpinner.cpp b/src/element/spinbox/SpinboxSpinner.cpp index 398fe02..2e4a639 100644 --- a/src/element/spinbox/SpinboxSpinner.cpp +++ b/src/element/spinbox/SpinboxSpinner.cpp @@ -126,12 +126,12 @@ Hyprutils::Math::Vector2D CSpinboxSpinner::size() { return impl->position.size(); } -std::optional CSpinboxSpinner::preferredSize(const Hyprutils::Math::Vector2D& parent) { - return m_layout->preferredSize(parent); +std::optional CSpinboxSpinner::preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow) { + return m_layout->preferredSize(parent, grow); } std::optional CSpinboxSpinner::minimumSize(const Hyprutils::Math::Vector2D& parent) { - return m_layout->preferredSize(parent); + return m_layout->preferredSize(parent, false); } std::optional CSpinboxSpinner::maximumSize(const Hyprutils::Math::Vector2D& parent) { diff --git a/src/element/text/Text.cpp b/src/element/text/Text.cpp index ec1e462..23ab096 100644 --- a/src/element/text/Text.cpp +++ b/src/element/text/Text.cpp @@ -210,8 +210,8 @@ std::optional CTextElement::maximumSize(const Hyprutils::Math::Vector2 return std::nullopt; } -std::optional CTextElement::preferredSize(const Hyprutils::Math::Vector2D& parent) { - auto s = m_impl->data.size.calculate(parent); +std::optional CTextElement::preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow) { + auto s = m_impl->data.size.calculate(parent, grow); if (s.x != -1 && s.y != -1) return s; diff --git a/src/element/textbox/Textbox.cpp b/src/element/textbox/Textbox.cpp index ddb82e1..6adc537 100644 --- a/src/element/textbox/Textbox.cpp +++ b/src/element/textbox/Textbox.cpp @@ -807,12 +807,12 @@ Hyprutils::Math::Vector2D CTextboxElement::size() { return impl->position.size(); } -std::optional CTextboxElement::preferredSize(const Hyprutils::Math::Vector2D& parent) { - return m_impl->data.size.calculate(parent); +std::optional CTextboxElement::preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow) { + return m_impl->data.size.calculate(parent, grow); } std::optional CTextboxElement::minimumSize(const Hyprutils::Math::Vector2D& parent) { - auto s = m_impl->data.size.calculate(parent); + auto s = m_impl->data.size.calculate(parent, false); if (s.x != -1 && s.y != -1) return s; return Vector2D{0, 0}; diff --git a/src/types/SizeType.cpp b/src/types/SizeType.cpp index 711551c..5b23484 100644 --- a/src/types/SizeType.cpp +++ b/src/types/SizeType.cpp @@ -6,17 +6,27 @@ CDynamicSize::CDynamicSize(eSizingType typeX, eSizingType typeY, const Hyprutils ; } -Hyprutils::Math::Vector2D CDynamicSize::calculate(Hyprutils::Math::Vector2D elSize) const { +Hyprutils::Math::Vector2D CDynamicSize::calculate(Hyprutils::Math::Vector2D elSize, bool grow) const { Hyprutils::Math::Vector2D size; switch (m_typeX) { case HT_SIZE_ABSOLUTE: size.x = m_value.x; break; - case HT_SIZE_PERCENT: size.x = m_value.x * elSize.x; break; + case HT_SIZE_PERCENT: + if (grow) + size.x = m_value.x * elSize.x; + else + size.x = -1; + break; case HT_SIZE_AUTO: size.x = -1; break; default: break; } switch (m_typeY) { case HT_SIZE_ABSOLUTE: size.y = m_value.y; break; - case HT_SIZE_PERCENT: size.y = m_value.y * elSize.y; break; + case HT_SIZE_PERCENT: + if (grow) + size.y = m_value.y * elSize.y; + else + size.y = -1; + break; case HT_SIZE_AUTO: size.y = -1; break; default: break; } diff --git a/src/window/WaylandWindow.cpp b/src/window/WaylandWindow.cpp index b1a0365..c2cb1af 100644 --- a/src/window/WaylandWindow.cpp +++ b/src/window/WaylandWindow.cpp @@ -329,7 +329,7 @@ void CWaylandWindow::onPreRender() { // pass Vector2D{0, 0} so PERCENT-sized descendants contribute nothing to the // natural size; only ABSOLUTE and AUTO content shape the window. - const auto preferred = m_rootElement->preferredSize(Vector2D{0, 0}); + const auto preferred = m_rootElement->preferredSize(Vector2D{0, 0}, false); if (!preferred || preferred->x <= 0 || preferred->y <= 0) return; diff --git a/tests/Controls.cpp b/tests/Controls.cpp index aa1f7c1..67ca6fd 100644 --- a/tests/Controls.cpp +++ b/tests/Controls.cpp @@ -109,7 +109,7 @@ static SP stretchLayout(std::string&& label, SP control) { auto nullE = CNullBuilder::begin()->commence(); nullE->setGrow(true); - auto container = CNullBuilder::begin()->size({CDynamicSize::HT_SIZE_AUTO, CDynamicSize::HT_SIZE_AUTO, {1, 1}})->commence(); + auto container = CNullBuilder::begin()->size({CDynamicSize::HT_SIZE_PERCENT, CDynamicSize::HT_SIZE_AUTO, {1, 1}})->commence(); container->setMargin(4); bg->addChild(container); @@ -211,7 +211,7 @@ int main(int argc, char** argv, char** envp) { auto spinbox = CSpinboxBuilder::begin() ->label("Spinbox") ->items({"Hello", "World", "Amongus"}) - ->size({CDynamicSize::HT_SIZE_AUTO, CDynamicSize::HT_SIZE_AUTO, {1, 1}}) + ->size({CDynamicSize::HT_SIZE_PERCENT, CDynamicSize::HT_SIZE_AUTO, {1, 1}}) ->fill(true) ->commence(); @@ -288,4 +288,4 @@ int main(int argc, char** argv, char** envp) { backend->enterLoop(); return 0; -} \ No newline at end of file +} diff --git a/tests/unit/elements/Spinbox.cpp b/tests/unit/elements/Spinbox.cpp index 47fd444..e271871 100644 --- a/tests/unit/elements/Spinbox.cpp +++ b/tests/unit/elements/Spinbox.cpp @@ -4,6 +4,7 @@ #include "../tricks/Tricks.hpp" #include "element/Element.hpp" +#include "hyprtoolkit/types/SizeType.hpp" using namespace Hyprtoolkit; @@ -76,11 +77,11 @@ TEST(Element, spinboxRebuildNormalizesSelection) { TEST(Element, spinboxRebuildAppliesFill) { Tests::Tricks::createBackendSupport(); - const auto spinbox = CSpinboxBuilder::begin()->items({"A"})->commence(); + const auto spinbox = CSpinboxBuilder::begin()->size({CDynamicSize::HT_SIZE_AUTO, CDynamicSize::HT_SIZE_AUTO, {1, 1}})->items({"A"})->commence(); const auto element = SP{spinbox}; const auto before = element->preferredSize({400, 100}); - spinbox->rebuild()->fill(true)->commence(); + spinbox->rebuild()->size({CDynamicSize::HT_SIZE_PERCENT, CDynamicSize::HT_SIZE_AUTO, {1, 1}})->fill(true)->commence(); const auto after = element->preferredSize({400, 100}); ASSERT_TRUE(before.has_value()); From 0e60d72d1be317163593af411cafead4cc0c01f3 Mon Sep 17 00:00:00 2001 From: Brayden Zee Date: Sun, 30 Aug 2026 12:42:59 -0400 Subject: [PATCH 4/6] layout: use gap when shrinking elements --- src/element/LinearLayout.hpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/element/LinearLayout.hpp b/src/element/LinearLayout.hpp index 2074452..80242bf 100644 --- a/src/element/LinearLayout.hpp +++ b/src/element/LinearLayout.hpp @@ -34,13 +34,14 @@ namespace Hyprtoolkit::LinearLayout { size_t i = 0; for (i = 0; i < C.size(); ++i) { - const auto& child = C.at(i); + const auto& child = C.at(i); + const float CURRENT_GAP = i == C.size() - 1 ? 0 : gap; Vector2D cSize = childSize(child); if (cSize == Vector2D{-1, -1}) cSize = Horizontal ? Vector2D{1.F, box.h} : Vector2D{box.w, 1.F}; - if (used + axisPrimary(cSize) > MAX + 1) { + if (used + axisPrimary(cSize) + CURRENT_GAP > MAX + 1) { // we exceeded our available space. if (!child->minimumSize(box.size())) { // doesn't fit: disable @@ -50,13 +51,13 @@ namespace Hyprtoolkit::LinearLayout { cSize = *child->minimumSize(box.size()); - if (used + axisPrimary(cSize) > MAX + 1) { + if (used + axisPrimary(cSize) + CURRENT_GAP > MAX + 1) { // doesn't fit: try to shrink any previous element if it // allows to do so. if we still can't fit after shrinking // (needs > 0 below), the current child is dropped and we // expand the previous one to cover the gap; minor visual // artefact in degenerate cases but the layout stays sane. - float needs = (used + axisPrimary(cSize)) - (MAX + 1); + float needs = (used + axisPrimary(cSize) + CURRENT_GAP) - (MAX + 1); for (int j = (int)i - 1; j >= 0; --j) { const auto& prevChild = C.at(j); const auto MIN = prevChild->minimumSize(box.size()); @@ -120,9 +121,7 @@ namespace Hyprtoolkit::LinearLayout { // can fit: use preferred sizes.at(i) = axisPrimary(cSize); child->impl->setFailedPositioning(false); - used += axisPrimary(cSize); - if (i != C.size() - 1) - used += gap; + used += axisPrimary(cSize) + CURRENT_GAP; } From 29cfbbf1b34cc981ab79be0cb6a500af32477267 Mon Sep 17 00:00:00 2001 From: Brayden Zee Date: Sun, 13 Sep 2026 11:57:11 -0400 Subject: [PATCH 5/6] element/slider: make the label configurable --- include/hyprtoolkit/element/Slider.hpp | 1 + src/element/slider/Builder.cpp | 7 ++++++- src/element/slider/Slider.cpp | 11 +++++++++-- src/element/slider/Slider.hpp | 1 + 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/include/hyprtoolkit/element/Slider.hpp b/include/hyprtoolkit/element/Slider.hpp index c0e6508..f5c849a 100644 --- a/include/hyprtoolkit/element/Slider.hpp +++ b/include/hyprtoolkit/element/Slider.hpp @@ -25,6 +25,7 @@ namespace Hyprtoolkit { Hyprutils::Memory::CSharedPointer val(float); Hyprutils::Memory::CSharedPointer snapInt(bool); Hyprutils::Memory::CSharedPointer size(CDynamicSize&&); + Hyprutils::Memory::CSharedPointer showLabel(bool); Hyprutils::Memory::CSharedPointer commence(); diff --git a/src/element/slider/Builder.cpp b/src/element/slider/Builder.cpp index acf6f3d..d2482ee 100644 --- a/src/element/slider/Builder.cpp +++ b/src/element/slider/Builder.cpp @@ -39,6 +39,11 @@ SP CSliderBuilder::size(CDynamicSize&& s) { return m_self.lock(); } +SP CSliderBuilder::showLabel(bool x) { + m_data->showLabel = x; + return m_self.lock(); +} + SP CSliderBuilder::commence() { if (m_element) { m_element->replaceData(*m_data); @@ -46,4 +51,4 @@ SP CSliderBuilder::commence() { } return CSliderElement::create(*m_data); -} \ No newline at end of file +} diff --git a/src/element/slider/Slider.cpp b/src/element/slider/Slider.cpp index 9b78141..b90a03d 100644 --- a/src/element/slider/Slider.cpp +++ b/src/element/slider/Slider.cpp @@ -49,11 +49,12 @@ CSliderElement::CSliderElement(const SSliderData& data) : IElement(), m_impl(mak ->rounding(g_palette->m_vars.smallRounding) ->borderColor([] { return g_palette->m_colors.alternateBase; }) ->borderThickness(1) - ->size(CDynamicSize{CDynamicSize::HT_SIZE_PERCENT, CDynamicSize::HT_SIZE_PERCENT, {1.F, 1.F}}) + ->size(CDynamicSize{CDynamicSize::HT_SIZE_AUTO, CDynamicSize::HT_SIZE_PERCENT, {1.F, 1.F}}) ->commence(); m_impl->background->setPositionMode(HT_POSITION_ABSOLUTE); m_impl->background->setPositionFlag(HT_POSITION_FLAG_CENTER, true); + m_impl->background->setGrow(true); m_impl->foreground = CRectangleBuilder::begin() ->color([] { return g_palette->m_colors.accent; }) @@ -64,7 +65,8 @@ CSliderElement::CSliderElement(const SSliderData& data) : IElement(), m_impl(mak m_impl->background->addChild(m_impl->foreground); m_impl->layout->addChild(m_impl->background); - m_impl->layout->addChild(m_impl->textContainer); + if (m_impl->data.showLabel) + m_impl->layout->addChild(m_impl->textContainer); addChild(m_impl->layout); @@ -176,6 +178,11 @@ void CSliderElement::replaceData(const SSliderData& data) { data.onChanged(m_impl->self.lock(), m_impl->data.current); } + if (m_impl->data.showLabel) + m_impl->layout->addChild(m_impl->textContainer); + else + m_impl->layout->removeChild(m_impl->textContainer); + if (impl->window) impl->window->scheduleReposition(impl->self); } diff --git a/src/element/slider/Slider.hpp b/src/element/slider/Slider.hpp index bcc9a57..e44fc30 100644 --- a/src/element/slider/Slider.hpp +++ b/src/element/slider/Slider.hpp @@ -15,6 +15,7 @@ namespace Hyprtoolkit { bool snapInt = true; std::function, float)> onChanged; CDynamicSize size{CDynamicSize::HT_SIZE_AUTO, CDynamicSize::HT_SIZE_AUTO, {}}; + bool showLabel = false; }; struct SSliderImpl { From 28af0fd979d206ce826f1b4dc0fd21a90f97a9a3 Mon Sep 17 00:00:00 2001 From: Brayden Zee Date: Sun, 13 Sep 2026 15:26:20 -0400 Subject: [PATCH 6/6] element/combobox: simplify combobox layout so auto size works This does not change the way it looks --- src/element/combobox/Combobox.cpp | 23 ++++++----------------- src/element/combobox/Combobox.hpp | 1 - 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/src/element/combobox/Combobox.cpp b/src/element/combobox/Combobox.cpp index 8567451..9c8526a 100644 --- a/src/element/combobox/Combobox.cpp +++ b/src/element/combobox/Combobox.cpp @@ -44,10 +44,8 @@ void CComboboxElement::init() { else m_impl->data.currentItem = std::min(m_impl->data.currentItem, m_impl->data.items.size() - 1); - m_impl->layout = CRowLayoutBuilder::begin()->size({CDynamicSize::HT_SIZE_PERCENT, CDynamicSize::HT_SIZE_ABSOLUTE, {1, 24}})->commence(); + m_impl->layout = CRowLayoutBuilder::begin()->size({CDynamicSize::HT_SIZE_PERCENT, CDynamicSize::HT_SIZE_PERCENT, {1, 1}})->gap(INNER_MARG)->commence(); - m_impl->layout->setPositionFlag(HT_POSITION_FLAG_CENTER, true); - m_impl->layout->setPositionMode(HT_POSITION_ABSOLUTE); m_impl->layout->setMargin(INNER_MARG); m_impl->label = CTextBuilder::begin() @@ -59,6 +57,8 @@ void CComboboxElement::init() { }) ->commence(); + m_impl->label->setGrow(true); + m_impl->background = CRectangleBuilder::begin() ->color([] { return g_palette->m_colors.base; }) ->rounding(g_palette->m_vars.smallRounding) @@ -67,8 +67,6 @@ void CComboboxElement::init() { ->size(CDynamicSize{CDynamicSize::HT_SIZE_PERCENT, CDynamicSize::HT_SIZE_PERCENT, {1.F, 1.F}}) ->commence(); - m_impl->background->setPositionMode(HT_POSITION_ABSOLUTE); - m_impl->background->setPositionFlag(HT_POSITION_FLAG_CENTER, true); m_impl->background->impl->clipChildren = true; m_impl->handle = CDropdownHandleElement::create(SDropdownHandleData{ @@ -76,17 +74,8 @@ void CComboboxElement::init() { .color = [] { return g_palette->m_colors.text; }, }); - m_impl->leftPad = CNullBuilder::begin()->size({CDynamicSize::HT_SIZE_ABSOLUTE, CDynamicSize::HT_SIZE_PERCENT, {INNER_MARG, 1.F}})->commence(); - m_impl->rightPad = CNullBuilder::begin()->size({CDynamicSize::HT_SIZE_ABSOLUTE, CDynamicSize::HT_SIZE_PERCENT, {INNER_MARG, 1.F}})->commence(); - m_impl->middlePad = CNullBuilder::begin()->size({CDynamicSize::HT_SIZE_ABSOLUTE, CDynamicSize::HT_SIZE_PERCENT, {INNER_MARG, 1.F}})->commence(); - - m_impl->middlePad->setGrow(true); - - m_impl->layout->addChild(m_impl->leftPad); m_impl->layout->addChild(m_impl->label); - m_impl->layout->addChild(m_impl->middlePad); m_impl->layout->addChild(m_impl->handle); - m_impl->layout->addChild(m_impl->rightPad); addChild(m_impl->background); addChild(m_impl->layout); @@ -273,15 +262,15 @@ Hyprutils::Math::Vector2D CComboboxElement::size() { } std::optional CComboboxElement::preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow) { - return m_impl->data.size.calculate(parent, grow); + return impl->getPreferredSizeGeneric(m_impl->data.size, parent, grow); } std::optional CComboboxElement::minimumSize(const Hyprutils::Math::Vector2D& parent) { - return m_impl->data.size.calculate(parent, false); + return impl->getPreferredSizeGeneric(m_impl->data.size, parent, false); } std::optional CComboboxElement::maximumSize(const Hyprutils::Math::Vector2D& parent) { - return m_impl->data.size.calculate(parent); + return impl->getPreferredSizeGeneric(m_impl->data.size, parent, true); } bool CComboboxElement::acceptsMouseInput() { diff --git a/src/element/combobox/Combobox.hpp b/src/element/combobox/Combobox.hpp index 2d79c03..4c7ea10 100644 --- a/src/element/combobox/Combobox.hpp +++ b/src/element/combobox/Combobox.hpp @@ -60,7 +60,6 @@ namespace Hyprtoolkit { SP layout; SP label; SP handle; - SP leftPad, rightPad, middlePad; struct { SP popup;