7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2025-03-31 07:10:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix spacers not actually taking any space

Browse source
This commit is contained in:
HJfod 2023-07-29 20:39:50 +03:00
parent 8027b807e5
commit 8ca2b99d7c
1 changed files with 7 additions and 3 deletions

10
loader/src/cocos2d-ext/Layout.cpp
View file

@ -221,9 +221,6 @@ static AxisPosition nodeAxis(CCNode* node, Axis axis, float scale) {
if (auto toggle = typeinfo_cast<CCMenuItemToggler*>(node)) {
scaledSize = toggle->m_offButton->getScaledContentSize();
}
if (auto spacer = typeinfo_cast<SpacerNode*>(node)) {
scaledSize = CCSizeZero;
}
auto anchor = node->getAnchorPoint();
if (axis == Axis::Row) {
return AxisPosition {
@ -492,6 +489,13 @@ void AxisLayout::tryFitLayout(
float crossScaleDownFactor = 0.f;
float crossSquishFactor = 0.f;
// make spacers have zero size so they don't affect spacing calculations
for (auto& node : CCArrayExt<CCNode>(nodes)) {
if (auto spacer = typeinfo_cast<SpacerNode*>(node)) {
spacer->setContentSize(CCSizeZero);
}
}
// fit everything into rows while possible
size_t ix = 0;
auto newNodes = nodes->shallowCopy();