Skip to content
Permalink
Browse files

Apply a scrollbar's default value to scroll containers (#9699)

Fixes #9691.
  • Loading branch information
Desour committed Apr 18, 2020
1 parent 7b57d3f commit 241bf442608d27df0ce3c74889c357fb5589ab20
Showing with 6 additions and 2 deletions.
  1. +1 −1 games/minimal/mods/test/formspec.lua
  2. +5 −1 src/gui/guiScrollContainer.h
@@ -251,7 +251,7 @@ Number]
"box[1,22.5;4,1;#a00a]"..
"scroll_container_end[]"..
"scrollbaroptions[max=170]".. -- lowest seen pos is: 0.1*170+6=23 (factor*max+height)
"scrollbar[7.5,0;0.3,4;vertical;scrbar;0]"..
"scrollbar[7.5,0;0.3,4;vertical;scrbar;20]"..
"scrollbar[8,0;0.3,4;vertical;scrbarhmmm;0]"..
"dropdown[0,6;2;hmdrpdwnnn;apple,bulb;1]",
}
@@ -38,7 +38,11 @@ class GUIScrollContainer : public gui::IGUIElement
updateScrolling();
}

inline void setScrollBar(GUIScrollBar *scrollbar) { m_scrollbar = scrollbar; }
inline void setScrollBar(GUIScrollBar *scrollbar)
{
m_scrollbar = scrollbar;
updateScrolling();
}

private:
enum OrientationEnum

0 comments on commit 241bf44

Please sign in to comment.
You can’t perform that action at this time.