diff options
| author | Jean-Patrick Guerrero <kilbith@users.noreply.github.com> | 2021-02-08 00:04:38 +0000 |
|---|---|---|
| committer | rubenwardy <rw@rubenwardy.com> | 2021-02-08 00:04:38 +0000 |
| commit | 6591597430c8a06c579e2631fcdbb022ae12160d (patch) | |
| tree | f41f8c560cd17167307c71689dc48585fbaa6582 | |
| parent | 857dbcd5728e2f18cdbb478d85f5861d5f0c7123 (diff) | |
| download | minetest-6591597430c8a06c579e2631fcdbb022ae12160d.tar.gz minetest-6591597430c8a06c579e2631fcdbb022ae12160d.tar.bz2 minetest-6591597430c8a06c579e2631fcdbb022ae12160d.zip | |
Fix animation_image support in scroll containers
| -rw-r--r-- | games/devtest/mods/testformspec/formspec.lua | 1 | ||||
| -rw-r--r-- | src/gui/guiFormSpecMenu.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/games/devtest/mods/testformspec/formspec.lua b/games/devtest/mods/testformspec/formspec.lua index bb178e1b3..2a2bdad60 100644 --- a/games/devtest/mods/testformspec/formspec.lua +++ b/games/devtest/mods/testformspec/formspec.lua @@ -227,6 +227,7 @@ local scroll_fs = "box[1,1;8,6;#00aa]".. "scroll_container[1,1;8,6;scrbar;vertical]".. "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]".. "pwdfield[2,2;1,1;lorem2;Lorem]".. "list[current_player;main;4,4;1,5;]".. diff --git a/src/gui/guiFormSpecMenu.cpp b/src/gui/guiFormSpecMenu.cpp index 88ea77812..5aa6dc9ae 100644 --- a/src/gui/guiFormSpecMenu.cpp +++ b/src/gui/guiFormSpecMenu.cpp @@ -928,7 +928,7 @@ void GUIFormSpecMenu::parseAnimatedImage(parserData *data, const std::string &el 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); if (parts.size() >= 7) |