From 241bf442608d27df0ce3c74889c357fb5589ab20 Mon Sep 17 00:00:00 2001 From: DS Date: Sat, 18 Apr 2020 17:20:20 +0200 Subject: [PATCH] Apply a scrollbar's default value to scroll containers (#9699) Fixes #9691. --- games/minimal/mods/test/formspec.lua | 2 +- src/gui/guiScrollContainer.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/games/minimal/mods/test/formspec.lua b/games/minimal/mods/test/formspec.lua index 53e92b243..4ab4f2717 100644 --- a/games/minimal/mods/test/formspec.lua +++ b/games/minimal/mods/test/formspec.lua @@ -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]", } diff --git a/src/gui/guiScrollContainer.h b/src/gui/guiScrollContainer.h index 9eaa880bf..a0306291e 100644 --- a/src/gui/guiScrollContainer.h +++ b/src/gui/guiScrollContainer.h @@ -38,7 +38,11 @@ public: updateScrolling(); } - inline void setScrollBar(GUIScrollBar *scrollbar) { m_scrollbar = scrollbar; } + inline void setScrollBar(GUIScrollBar *scrollbar) + { + m_scrollbar = scrollbar; + updateScrolling(); + } private: enum OrientationEnum