Fixed widgets not being updated in BoxLayout when a child widget's in…

…dex was changed using setWidgetIndex (fixes texus#202)
CasualYT31 · Aug 26, 2023 · 4d2af07 · 4d2af07
1 parent 6c4879e
commit 4d2af07
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/include/TGUI/Container.hpp b/include/TGUI/Container.hpp
@@ -345,7 +345,7 @@ TGUI_MODULE_EXPORT namespace tgui
         ///
         /// @return True when the index was changed, false if widget wasn't found in the container or index was too high
         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        bool setWidgetIndex(const Widget::Ptr& widget, std::size_t index);
+        virtual bool setWidgetIndex(const Widget::Ptr& widget, std::size_t index);
 
 
         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

diff --git a/include/TGUI/Widgets/BoxLayout.hpp b/include/TGUI/Widgets/BoxLayout.hpp
@@ -137,6 +137,20 @@ TGUI_MODULE_EXPORT namespace tgui
         using Container::get;
 
 
+        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        /// @brief Changes the index of a widget in this container
+        ///
+        /// Widgets are drawn in the order of the list, so widgets with a higher index will appear after others.
+        ///
+        /// @param widget  Widget that is to be moved to a different index
+        /// @param index   New index of the widget, corresponding to the widget position after the widget has been moved
+        ///
+        /// @return True when the index was changed, false if widget wasn't found in the container or index was too high
+        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        virtual bool setWidgetIndex(const Widget::Ptr& widget, std::size_t index) override;
+        using Container::setWidgetIndex;
+
+
         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     protected:
 

diff --git a/src/Widgets/BoxLayout.cpp b/src/Widgets/BoxLayout.cpp
@@ -131,6 +131,16 @@ namespace tgui
 
     /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+    bool BoxLayout::setWidgetIndex(const Widget::Ptr& widget, std::size_t index)
+    {
+        const auto widgetIndexChanged = Container::setWidgetIndex(widget, index);
+        if (widgetIndexChanged)
+            updateWidgets();
+        return widgetIndexChanged;
+    }
+
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
     void BoxLayout::rendererChanged(const String& property)
     {
         if (property == U"SpaceBetweenWidgets")