BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix animation_image support in scroll containers

Browse Source
This commit is contained in:
Jean-Patrick Guerrero 2021-02-08 00:04:38 +00:00 committed by rubenwardy
parent 857dbcd572
commit 6591597430
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
games/devtest/mods/testformspec/formspec.lua
View File

@ -227,6 +227,7 @@ local scroll_fs =
"box[1,1;8,6;#00aa]".. "box[1,1;8,6;#00aa]"..
"scroll_container[1,1;8,6;scrbar;vertical]".. "scroll_container[1,1;8,6;scrbar;vertical]"..
"button[0,1;1,1;lorem;Lorem]".. "button[0,1;1,1;lorem;Lorem]"..
"animated_image[0,1;4.5,1;clip_animated_image;testformspec_animation.png;4;100]" ..
"button[0,10;1,1;ipsum;Ipsum]".. "button[0,10;1,1;ipsum;Ipsum]"..
"pwdfield[2,2;1,1;lorem2;Lorem]".. "pwdfield[2,2;1,1;lorem2;Lorem]"..
"list[current_player;main;4,4;1,5;]".. "list[current_player;main;4,4;1,5;]"..

2
src/gui/guiFormSpecMenu.cpp
View File

@ -928,7 +928,7 @@ void GUIFormSpecMenu::parseAnimatedImage(parserData *data, const std::string &el
core::rect<s32> rect = core::rect<s32>(pos, pos + geom); core::rect<s32> rect = core::rect<s32>(pos, pos + geom);
GUIAnimatedImage *e = new GUIAnimatedImage(Environment, this, spec.fid, GUIAnimatedImage *e = new GUIAnimatedImage(Environment, data->current_parent, spec.fid,
rect, texture_name, frame_count, frame_duration, m_tsrc); rect, texture_name, frame_count, frame_duration, m_tsrc);
if (parts.size() >= 7) if (parts.size() >= 7)