7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-14 19:15:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

make AxisLayout size hint more reasonable

Browse source
This commit is contained in:
HJfod 2024-08-23 11:32:26 +03:00
parent 6ed6b32669
commit 85e7b5e3ab
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
loader/src/cocos2d-ext/AxisLayout.cpp
View file

@ -823,6 +823,13 @@ CCSize AxisLayout::getSizeHint(CCNode* on) const {
axis.crossLength = cross; axis.crossLength = cross;
} }
} }
if (auto l = m_impl->m_autoGrowAxisMinLength) {
length = std::max(length, *l);
}
// No overflow
else {
length = std::min(length, nodeAxis(on, m_impl->m_axis, 1.f).axisLength);
}
if (!m_impl->m_allowCrossAxisOverflow) { if (!m_impl->m_allowCrossAxisOverflow) {
cross = nodeAxis(on, m_impl->m_axis, 1.f).crossLength; cross = nodeAxis(on, m_impl->m_axis, 1.f).crossLength;
} }