Ticket #3415: t3415_cleanup_dropdown_v1.patch

source/gui/CDropDown.cpp

@@ -489 +491 @@
 
         CPos pos(m_CachedActualSize.left, m_CachedActualSize.top);
         DrawText(selected, color, pos, bz+0.1f, cliparea);
     }
 
-    bool* scrollbar = NULL;
-    bool old;
-    GUI<bool>::GetSettingPointer(this, "scrollbar", scrollbar);
-
-    old = *scrollbar;
-
     if (m_Open)
-    {
-        if (m_HideScrollBar)
-            *scrollbar = false;
-
-        DrawList(m_ElementHighlight, "sprite_list", "sprite_selectarea", "textcolor");
-
-        if (m_HideScrollBar)
-            *scrollbar = old;
-    }
+        DrawList(m_ElementHighlight, "sprite_list", "sprite_selectarea", "textcolor", m_HideScrollBar);
 }
 
 // When a dropdown list is opened, it needs to be visible above all the other
 // controls on the page. The only way I can think of to do this is to increase
 // its z value when opened, so that it's probably on top.

source/gui/CList.cpp

@@ -292 +293 @@
     GUI<int>::GetSetting(this, "selected", selected);
 
     DrawList(selected, "sprite", "sprite_selectarea", "textcolor");
 }
 
-void CList::DrawList(const int& selected, const CStr& _sprite, const CStr& _sprite_selected, const CStr& _textcolor)
+void CList::DrawList(const int& selected, const CStr& _sprite, const CStr& _sprite_selected, const CStr& _textcolor, const bool hideScrollbar)
 {
     float bz = GetBufferedZ();
 
     // First call draw on ScrollBarOwner
     bool scrollbar;
     GUI<bool>::GetSetting(this, "scrollbar", scrollbar);
+    scrollbar = scrollbar && !hideScrollbar;
 
     if (scrollbar)
         IGUIScrollBarOwner::Draw();
 
     if (GetGUI())

source/gui/CList.h

@@ -83 +83 @@
     virtual bool HandleAdditionalChildren(const XMBElement& child, CXeromyces* pFile);
 
     // Called every time the auto-scrolling should be checked.
     void UpdateAutoScroll();
 
-    // Extended drawing interface, this is so that classes built on the this one
-    //  can use other sprite names.
-    virtual void DrawList(const int& selected, const CStr& _sprite, const CStr& _sprite_selected, const CStr& _textcolor);
+    // Extended drawing interface, this is so that classes built on this one can use other sprite names.
+    virtual void DrawList(const int& selected, const CStr& _sprite, const CStr& _sprite_selected, const CStr& _textcolor, const bool hideScrollbar = false);
 
     // Get the area of the list. This is so that it can easily be changed, like in CDropDown
     //  where the area is not equal to m_CachedActualSize.
     virtual CRect GetListRect() const { return m_CachedActualSize; }