Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/hyprtoolkit/element/Button.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent);
virtual std::optional<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true);
virtual std::optional<Hyprutils::Math::Vector2D> minimumSize(const Hyprutils::Math::Vector2D& parent);
virtual std::optional<Hyprutils::Math::Vector2D> maximumSize(const Hyprutils::Math::Vector2D& parent);
virtual bool acceptsMouseInput();
Expand Down
2 changes: 1 addition & 1 deletion include/hyprtoolkit/element/Checkbox.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent);
virtual std::optional<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true);
virtual std::optional<Hyprutils::Math::Vector2D> minimumSize(const Hyprutils::Math::Vector2D& parent);
virtual std::optional<Hyprutils::Math::Vector2D> maximumSize(const Hyprutils::Math::Vector2D& parent);
virtual bool acceptsMouseInput();
Expand Down
2 changes: 1 addition & 1 deletion include/hyprtoolkit/element/ColumnLayout.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent);
virtual std::optional<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true);
virtual std::optional<Hyprutils::Math::Vector2D> minimumSize(const Hyprutils::Math::Vector2D& parent);
virtual bool positioningDependsOnChild();

Expand Down
2 changes: 1 addition & 1 deletion include/hyprtoolkit/element/Combobox.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent);
virtual std::optional<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true);
virtual std::optional<Hyprutils::Math::Vector2D> minimumSize(const Hyprutils::Math::Vector2D& parent);
virtual std::optional<Hyprutils::Math::Vector2D> maximumSize(const Hyprutils::Math::Vector2D& parent);
virtual bool acceptsMouseInput();
Expand Down
2 changes: 1 addition & 1 deletion include/hyprtoolkit/element/Element.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ namespace Hyprtoolkit {

/* Sizes for auto positioning in layouts */
virtual std::optional<Hyprutils::Math::Vector2D>
preferredSize(const Hyprutils::Math::Vector2D& parent);
preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true);
virtual std::optional<Hyprutils::Math::Vector2D> minimumSize(const Hyprutils::Math::Vector2D& parent);
virtual std::optional<Hyprutils::Math::Vector2D> maximumSize(const Hyprutils::Math::Vector2D& parent);

Expand Down
2 changes: 1 addition & 1 deletion include/hyprtoolkit/element/Image.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent);
virtual std::optional<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true);
virtual std::optional<Hyprutils::Math::Vector2D> minimumSize(const Hyprutils::Math::Vector2D& parent);
virtual std::optional<Hyprutils::Math::Vector2D> maximumSize(const Hyprutils::Math::Vector2D& parent);
virtual bool positioningDependsOnChild();
Expand Down
2 changes: 1 addition & 1 deletion include/hyprtoolkit/element/Line.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent);
virtual std::optional<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true);
virtual std::optional<Hyprutils::Math::Vector2D> minimumSize(const Hyprutils::Math::Vector2D& parent);
virtual std::optional<Hyprutils::Math::Vector2D> maximumSize(const Hyprutils::Math::Vector2D& parent);
virtual bool positioningDependsOnChild();
Expand Down
2 changes: 1 addition & 1 deletion include/hyprtoolkit/element/Null.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent);
virtual std::optional<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true);
virtual std::optional<Hyprutils::Math::Vector2D> minimumSize(const Hyprutils::Math::Vector2D& parent);
virtual std::optional<Hyprutils::Math::Vector2D> maximumSize(const Hyprutils::Math::Vector2D& parent);
virtual bool positioningDependsOnChild();
Expand Down
2 changes: 1 addition & 1 deletion include/hyprtoolkit/element/ProgressBar.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent);
virtual std::optional<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true);
virtual std::optional<Hyprutils::Math::Vector2D> minimumSize(const Hyprutils::Math::Vector2D& parent);
virtual std::optional<Hyprutils::Math::Vector2D> maximumSize(const Hyprutils::Math::Vector2D& parent);
virtual bool positioningDependsOnChild();
Expand Down
2 changes: 1 addition & 1 deletion include/hyprtoolkit/element/Rectangle.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent);
virtual std::optional<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true);
virtual std::optional<Hyprutils::Math::Vector2D> minimumSize(const Hyprutils::Math::Vector2D& parent);
virtual std::optional<Hyprutils::Math::Vector2D> maximumSize(const Hyprutils::Math::Vector2D& parent);
virtual bool positioningDependsOnChild();
Expand Down
2 changes: 1 addition & 1 deletion include/hyprtoolkit/element/RowLayout.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent);
virtual std::optional<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true);
virtual std::optional<Hyprutils::Math::Vector2D> minimumSize(const Hyprutils::Math::Vector2D& parent);
virtual bool positioningDependsOnChild();
Hyprutils::Math::Vector2D childSize(Hyprutils::Memory::CSharedPointer<IElement> child);
Expand Down
2 changes: 1 addition & 1 deletion include/hyprtoolkit/element/ScrollArea.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent);
virtual std::optional<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true);
virtual std::optional<Hyprutils::Math::Vector2D> minimumSize(const Hyprutils::Math::Vector2D& parent);
virtual bool acceptsMouseInput();
virtual bool alwaysGetMouseInput();
Expand Down
3 changes: 2 additions & 1 deletion include/hyprtoolkit/element/Slider.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ namespace Hyprtoolkit {
Hyprutils::Memory::CSharedPointer<CSliderBuilder> val(float);
Hyprutils::Memory::CSharedPointer<CSliderBuilder> snapInt(bool);
Hyprutils::Memory::CSharedPointer<CSliderBuilder> size(CDynamicSize&&);
Hyprutils::Memory::CSharedPointer<CSliderBuilder> showLabel(bool);

Hyprutils::Memory::CSharedPointer<CSliderElement> commence();

Expand Down Expand Up @@ -54,7 +55,7 @@ namespace Hyprtoolkit {

virtual void paint();
virtual void reposition(const Hyprutils::Math::CBox& box, const Hyprutils::Math::Vector2D& maxSize = {-1, -1});
virtual std::optional<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent);
virtual std::optional<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true);
virtual std::optional<Hyprutils::Math::Vector2D> minimumSize(const Hyprutils::Math::Vector2D& parent);
virtual std::optional<Hyprutils::Math::Vector2D> maximumSize(const Hyprutils::Math::Vector2D& parent);
virtual bool acceptsMouseInput();
Expand Down
2 changes: 1 addition & 1 deletion include/hyprtoolkit/element/Spinbox.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent);
virtual std::optional<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true);
virtual std::optional<Hyprutils::Math::Vector2D> minimumSize(const Hyprutils::Math::Vector2D& parent);
virtual std::optional<Hyprutils::Math::Vector2D> maximumSize(const Hyprutils::Math::Vector2D& parent);
virtual bool acceptsMouseInput();
Expand Down
2 changes: 1 addition & 1 deletion include/hyprtoolkit/element/Text.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent);
virtual std::optional<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true);
virtual std::optional<Hyprutils::Math::Vector2D> minimumSize(const Hyprutils::Math::Vector2D& parent);
virtual std::optional<Hyprutils::Math::Vector2D> maximumSize(const Hyprutils::Math::Vector2D& parent);
virtual bool positioningDependsOnChild();
Expand Down
2 changes: 1 addition & 1 deletion include/hyprtoolkit/element/Textbox.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent);
virtual std::optional<Hyprutils::Math::Vector2D> preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow = true);
virtual std::optional<Hyprutils::Math::Vector2D> minimumSize(const Hyprutils::Math::Vector2D& parent);
virtual std::optional<Hyprutils::Math::Vector2D> maximumSize(const Hyprutils::Math::Vector2D& parent);
virtual bool acceptsMouseInput();
Expand Down
4 changes: 2 additions & 2 deletions include/hyprtoolkit/types/SizeType.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 :

Expand All @@ -27,4 +27,4 @@ namespace Hyprtoolkit {
eSizingType m_typeX = HT_SIZE_ABSOLUTE, m_typeY = HT_SIZE_ABSOLUTE;
Hyprutils::Math::Vector2D m_value;
};
}
}
20 changes: 14 additions & 6 deletions src/element/Element.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ void IElement::setTooltip(std::string&& x) {
impl->hasTooltip = !impl->tooltip.empty();
}

std::optional<Hyprutils::Math::Vector2D> IElement::preferredSize(const Hyprutils::Math::Vector2D& parent) {
std::optional<Hyprutils::Math::Vector2D> IElement::preferredSize(const Hyprutils::Math::Vector2D& parent, bool grow) {
return std::nullopt;
}

Expand Down Expand Up @@ -536,10 +536,10 @@ void SElementInternalData::setFailedPositioning(bool set) {
breadthfirst([set](SP<IElement> 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);

Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/element/Element.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
};

}
15 changes: 8 additions & 7 deletions src/element/LinearLayout.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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());
Expand Down Expand Up @@ -113,24 +114,24 @@ 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) + CURRENT_GAP;
}

if (!C.empty())
used -= gap;

// grow the first element marked as growing on this axis to fill remaining space
if (used < MAX) {
for (i = 0; i < C.size(); ++i) {
if (!grows(C.at(i)))
continue;
sizes.at(i) += MAX - used;
used = MAX;
break;
}
}
Expand Down
Loading
Loading