mirror of
https://github.com/geode-sdk/geode.git
synced 2024-11-14 19:15:05 -05:00
nvm alk fixed ck
This commit is contained in:
parent
65a80c1057
commit
91a550971b
1 changed files with 7 additions and 8 deletions
|
@ -823,14 +823,13 @@ CCSize AxisLayout::getSizeHint(CCNode* on) const {
|
||||||
axis.crossLength = cross;
|
axis.crossLength = cross;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// this broke customkeybinds...
|
if (auto l = m_impl->m_autoGrowAxisMinLength) {
|
||||||
// if (auto l = m_impl->m_autoGrowAxisMinLength) {
|
length = std::max(length, *l);
|
||||||
// length = std::max(length, *l);
|
}
|
||||||
// }
|
// No overflow
|
||||||
// // No overflow
|
else {
|
||||||
// else {
|
length = std::min(length, nodeAxis(on, m_impl->m_axis, 1.f).axisLength);
|
||||||
// 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;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue