From 91a550971bbb493c068131a5d7173426e26670bd Mon Sep 17 00:00:00 2001 From: HJfod <60038575+HJfod@users.noreply.github.com> Date: Tue, 10 Sep 2024 22:23:58 +0300 Subject: [PATCH] nvm alk fixed ck --- loader/src/cocos2d-ext/AxisLayout.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/loader/src/cocos2d-ext/AxisLayout.cpp b/loader/src/cocos2d-ext/AxisLayout.cpp index 5cf331c12..cedded25c 100644 --- a/loader/src/cocos2d-ext/AxisLayout.cpp +++ b/loader/src/cocos2d-ext/AxisLayout.cpp @@ -823,14 +823,13 @@ CCSize AxisLayout::getSizeHint(CCNode* on) const { axis.crossLength = cross; } } - // this broke customkeybinds... - // 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 (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) { cross = nodeAxis(on, m_impl->m_axis, 1.f).crossLength; }