Merge branch 'revertgapwrap' into 'master'

Revert !5275

See merge request OpenMW/openmw!5335

Author: glassmancody

CMakeLists.txt

@@ -82,7 +82,7 @@ message(STATUS "Configuring OpenMW...")
 set(OPENMW_VERSION_MAJOR 0)
 set(OPENMW_VERSION_MINOR 52)
 set(OPENMW_VERSION_RELEASE 0)
-set(OPENMW_LUA_API_REVISION 132)
+set(OPENMW_LUA_API_REVISION 133)
 set(OPENMW_POSTPROCESSING_API_REVISION 5)
 
 set(OPENMW_VERSION_COMMITHASH "")

components/lua_ui/flex.cpp

@@ -4,8 +4,6 @@ namespace LuaUi
 {
     void LuaFlex::updateProperties()
     {
-        mGap = propertyValue("gap", 0);
-        mWrap = propertyValue("wrap", false);
         mHorizontal = propertyValue("horizontal", false);
         mAutoSized = propertyValue("autoSize", true);
         mAlign = propertyValue("align", Alignment::Start);
@@ -17,16 +15,22 @@ namespace LuaUi
     {
         int alignSize(int container, int content, Alignment alignment)
         {
-            switch (alignment)
+            int alignedPosition = 0;
             {
-                case Alignment::Start:
-                    return 0;
-                case Alignment::Center:
-                    return (container - content) / 2;
-                case Alignment::End:
-                    return container - content;
+                switch (alignment)
+                {
+                    case Alignment::Start:
+                        alignedPosition = 0;
+                        break;
+                    case Alignment::Center:
+                        alignedPosition = (container - content) / 2;
+                        break;
+                    case Alignment::End:
+                        alignedPosition = container - content;
+                        break;
+                }
             }
-            return 0;
+            return alignedPosition;
         }
 
         float getGrow(WidgetExtension* w)
@@ -37,94 +41,41 @@ namespace LuaUi
 
     void LuaFlex::updateChildren()
     {
-        const auto& flexChildren = children();
-        MyGUI::IntSize flexSize = calculateSize();
-
+        float totalGrow = 0;
         MyGUI::IntSize childrenSize;
-        int currentSecondaryAxisPosition = 0;
-        size_t widgetIndex = 0;
-
-        while (widgetIndex < flexChildren.size())
+        for (auto* w : children())
         {
-            const size_t trackStart = widgetIndex;
-            int primaryAxisSize = 0;
-            int primaryAxisSizeRemaining = mAutoSized ? 0 : primary(flexSize);
-            int secondaryAxisSize = 0;
-            float totalPrimaryGrow = 0;
-
-            while (widgetIndex < flexChildren.size())
-            {
-                auto* w = flexChildren[widgetIndex];
-                w->clearForced();
-
-                const MyGUI::IntSize size = w->calculateSize();
-                const int childPrimary = primary(size);
-                const int childSecondary = secondary(size);
-                const bool notFirstOnTrack = (widgetIndex > trackStart);
-                const int primaryToAdd = childPrimary + (notFirstOnTrack ? mGap : 0);
-
-                if (!mAutoSized && mWrap && notFirstOnTrack && primaryAxisSizeRemaining < primaryToAdd)
-                    break;
-
-                primaryAxisSize += primaryToAdd;
-                if (!mAutoSized)
-                    primaryAxisSizeRemaining -= primaryToAdd;
-                secondaryAxisSize = std::max(childSecondary, secondaryAxisSize);
-                totalPrimaryGrow += getGrow(w);
-                widgetIndex++;
-            }
-            primaryAxisSizeRemaining = std::max(0, primaryAxisSizeRemaining);
-
-            if (mAutoSized)
-            {
-                primary(childrenSize) = std::max(primaryAxisSize, primary(childrenSize));
-                secondary(childrenSize) += secondaryAxisSize;
-            }
-
-            const int primaryAxisChildrenShift
-                = alignSize(primaryAxisSize, primaryAxisSize - primaryAxisSizeRemaining, mAlign);
-            int currentPrimaryAxisPosition = primaryAxisChildrenShift;
-
-            // Keeping a constant total here ensures widgets that use grow don't use the
-            // changing 'primaryAxisSizeRemaining' (which shrinks as we take off grown amounts
-            const int totalPrimaryAxisSizeRemaining = primaryAxisSizeRemaining;
-
-            for (size_t j = trackStart; j < widgetIndex; ++j)
-            {
-                auto* w = flexChildren[j];
-                MyGUI::IntPoint widgetPosition;
-                MyGUI::IntSize widgetSize = w->calculateSize();
-
-                // Note: Grow is on the primary axis and stretch is "grow" on the cross/secondary axis
-                const float widgetGrowFactor = getGrow(w);
-                const float stretch = std::clamp(w->externalValue("stretch", 0.0f), 0.0f, 1.0f);
-                if (widgetGrowFactor > 0)
-                {
-                    const int pixelsToExpandBy = std::clamp(
-                        static_cast<int>(
-                            std::round((widgetGrowFactor / totalPrimaryGrow) * totalPrimaryAxisSizeRemaining)),
-                        0, primaryAxisSizeRemaining);
-                    primary(widgetSize) += pixelsToExpandBy;
-                    primaryAxisSizeRemaining -= pixelsToExpandBy;
-                }
-
-                secondary(widgetSize) = std::max(secondary(widgetSize),
-                    std::clamp(static_cast<int>(std::round(stretch * secondaryAxisSize)), 0, secondaryAxisSize));
-
-                primary(widgetPosition) = currentPrimaryAxisPosition;
-                currentPrimaryAxisPosition += primary(widgetSize) + mGap;
-                secondary(widgetPosition)
-                    = currentSecondaryAxisPosition + alignSize(secondaryAxisSize, secondary(widgetSize), mArrange);
-
-                w->forceSize(widgetSize);
-                w->forcePosition(widgetPosition);
-                w->updateCoord();
-            }
+            w->clearForced();
+            MyGUI::IntSize size = w->calculateSize();
+            primary(childrenSize) += primary(size);
+            secondary(childrenSize) = std::max(secondary(childrenSize), secondary(size));
+            totalGrow += getGrow(w);
+        }
+        mChildrenSize = childrenSize;
 
-            currentSecondaryAxisPosition += secondaryAxisSize + mGap;
+        MyGUI::IntSize flexSize = calculateSize();
+        int growSize = 0;
+        float growFactor = 0;
+        if (totalGrow > 0)
+        {
+            growSize = primary(flexSize) - primary(childrenSize);
+            growFactor = growSize / totalGrow;
         }
 
-        mChildrenSize = childrenSize;
+        MyGUI::IntPoint childPosition;
+        primary(childPosition) = alignSize(primary(flexSize) - growSize, primary(childrenSize), mAlign);
+        for (auto* w : children())
+        {
+            MyGUI::IntSize size = w->calculateSize();
+            primary(size) += static_cast<int>(growFactor * getGrow(w));
+            float stretch = std::clamp(w->externalValue("stretch", 0.0f), 0.0f, 1.0f);
+            secondary(size) = std::max(secondary(size), static_cast<int>(stretch * secondary(flexSize)));
+            secondary(childPosition) = alignSize(secondary(flexSize), secondary(size), mArrange);
+            w->forcePosition(childPosition);
+            w->forceSize(size);
+            w->updateCoord();
+            primary(childPosition) += primary(size);
+        }
         WidgetExtension::updateChildren();
     }
 
@@ -157,7 +108,7 @@ namespace LuaUi
     const std::vector<std::string_view>& LuaFlex::allUsedProperties() const
     {
         static std::vector<std::string_view> usedProps = std::invoke([this] {
-            std::vector<std::string_view> props = { "horizontal", "autoSize", "arrange", "align", "gap", "wrap" };
+            std::vector<std::string_view> props = { "horizontal", "autoSize", "arrange", "align" };
             auto baseProps = WidgetExtension::allUsedProperties();
             props.insert(props.end(), baseProps.begin(), baseProps.end());
             return props;

components/lua_ui/flex.hpp

@@ -28,8 +28,6 @@ namespace LuaUi
         MyGUI::IntSize mChildrenSize;
         Alignment mAlign;
         Alignment mArrange;
-        int mGap;
-        bool mWrap;
 
         template <typename T>
         T& primary(MyGUI::types::TPoint<T>& point) const

docs/source/reference/lua-scripting/widgets/flex.rst

@@ -59,13 +59,6 @@ Properties
   * - arrange
     - ui.ALIGNMENT (Start)
     - How to arrange the children in the cross axis.
-  * - gap
-    - number (0)
-    - The pixel gap between children in the main axis.
-  * - wrap
-    - bool (false)
-    - | If true, children will wrap to the next row (or column) when they exceed the main axis size.
-      | Only applicable when `autoSize` is `false`.
 
 Events
 ------