From 4b5d112442929d5c135cc776eff5933da335efc8 Mon Sep 17 00:00:00 2001
From: altalk23 <45172705+altalk23@users.noreply.github.com>
Date: Sun, 1 Dec 2024 20:22:05 +0300
Subject: [PATCH] do not break intended behavior while fixing #926

---
 loader/src/cocos2d-ext/AxisLayout.cpp | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/loader/src/cocos2d-ext/AxisLayout.cpp b/loader/src/cocos2d-ext/AxisLayout.cpp
index deb874d1..1d0dbec0 100644
--- a/loader/src/cocos2d-ext/AxisLayout.cpp
+++ b/loader/src/cocos2d-ext/AxisLayout.cpp
@@ -291,7 +291,7 @@ public:
         return attemptRescale;
     }
 
-    float nextGap(AxisLayoutOptions const* now, AxisLayoutOptions const* next) const {
+    float nextGap(AxisLayoutOptions const* now, AxisLayoutOptions const* next, size_t ix) const {
         std::optional<float> gap;
         if (now) {
             gap = now->getNextGap();
@@ -299,7 +299,7 @@ public:
         if (next && (!gap || gap.value() < next->getPrevGap())) {
             gap = next->getPrevGap();
         }
-        return gap.value_or(m_gap);
+        return gap.value_or(ix ? m_gap : 0);
     }
 
     Row* fitInRow(
@@ -355,7 +355,7 @@ public:
                     res->addObject(node);
                 }
                 if (ix) {
-                    auto gap = nextGap(prev, opts);
+                    auto gap = nextGap(prev, opts, ix);
                     // if we've exhausted all priority scale options, scale gap too
                     if (prio == minMaxPrios.first) {
                         nextAxisScalableLength += gap * scale * squish;
@@ -690,10 +690,10 @@ public:
                 else {
                     if (ix != 0) {
                         if (row->prio == minMaxPrios.first) {
-                            rowAxisPos += this->nextGap(prev, opts) * row->scale * row->squish;
+                            rowAxisPos += this->nextGap(prev, opts, ix) * row->scale * row->squish;
                         }
                         else {
-                            rowAxisPos += this->nextGap(prev, opts) * row->squish;
+                            rowAxisPos += this->nextGap(prev, opts, ix) * row->squish;
                         }
                     }
                     axisPos = rowAxisPos + pos.axisLength * pos.axisAnchor;
@@ -751,7 +751,7 @@ void AxisLayout::apply(CCNode* on) {
     float totalLength = 0;
     AxisLayoutOptions const* prev = nullptr;
 
-    bool first = true;
+    size_t ix = 0;
     for (auto node : CCArrayExt<CCNode*>(nodes)) {
         // Require all nodes not to have this stupid option enabled because it 
         // screws up all position calculations
@@ -773,7 +773,7 @@ void AxisLayout::apply(CCNode* on) {
                 doAutoScale = true;
             }
         }
-        if (first) {
+        if (ix == 0) {
             minMaxPrio = { prio, prio };
         }
         else {
@@ -785,13 +785,10 @@ void AxisLayout::apply(CCNode* on) {
             }
         }
         if (m_impl->m_autoGrowAxisMinLength.has_value()) {
-            totalLength += nodeAxis(node, m_impl->m_axis, 1.f).axisLength;
-            if (!first) {
-                totalLength += m_impl->nextGap(prev, opts);
-            }
+            totalLength += nodeAxis(node, m_impl->m_axis, 1.f).axisLength + m_impl->nextGap(prev, opts, ix);
             prev = opts;
         }
-        first = false;
+        ix++;
     }
 
     if (m_impl->m_autoGrowAxisMinLength.has_value()) {