nvm alk fixed ck

geode-sdk · Sep 10, 2024 · 91a5509 · 91a5509
1 parent 65a80c1
commit 91a5509
Showing 1 changed file with 7 additions and 8 deletions.
diff --git 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;
     }