Add more resizing code to CGUISTKListBox

supertuxkart · Apr 22, 2024 · 85e52de · 85e52de
1 parent f683699
commit 85e52de
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/guiengine/widgets/CGUISTKListBox.cpp b/src/guiengine/widgets/CGUISTKListBox.cpp
@@ -161,6 +161,13 @@ void CGUISTKListBox::clear()
 }
 
 
+void CGUISTKListBox::updateDefaultItemHeight()
+{
+    if (ItemHeightOverride == 0)
+        ItemHeight = Font->getHeightPerLine() + 4;
+}
+
+
 void CGUISTKListBox::recalculateItemHeight()
 {
     IGUISkin* skin = Environment->getSkin();
@@ -176,9 +183,7 @@ void CGUISTKListBox::recalculateItemHeight()
 
         if (Font)
         {
-            if ( 0 == ItemHeightOverride )
-                ItemHeight = Font->getHeightPerLine() + 4;
-
+            updateDefaultItemHeight();
             Font->grab();
         }
     }
@@ -470,7 +475,11 @@ void CGUISTKListBox::updateAbsolutePosition()
         }
     }
 
-    recalculateItemHeight();
+    if (Font)
+        updateDefaultItemHeight();
+    ItemsIconWidth = 0;
+    if (!Items.empty())
+        recalculateIconWidth();
 }
 
 

diff --git a/src/guiengine/widgets/CGUISTKListBox.hpp b/src/guiengine/widgets/CGUISTKListBox.hpp
@@ -181,6 +181,7 @@ namespace irr
     private:
 
             void recalculateItemHeight();
+            void updateDefaultItemHeight();
             void selectNew(s32 ypos, bool onlyHover=false);
             void recalculateScrollPos();
             void updateScrollBarSize(s32 size);