voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-10 05:21:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

ui scripting related fixes

Browse source
This commit is contained in:
MihailRis 2024-02-13 14:36:10 +03:00
parent 7f17face73
commit 302b649634
8 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/frontend/gui/controls.h
View file

@ -17,9 +17,6 @@ class Batch2D;
class Assets;
namespace gui {
using wstringsupplier = std::function<std::wstring()>;
using wstringconsumer = std::function<void(std::wstring)>;
using doublesupplier = std::function<double()>;
using doubleconsumer = std::function<void(double)>;

4
src/frontend/gui/gui_xml.cpp
View file

@ -133,7 +133,7 @@ static std::shared_ptr<UINode> readButton(UiXmlReader& reader, xml::xmlelement e
auto callback = scripting::create_runnable(
reader.getEnvironment().getId(),
element->attr("onclick").getText(),
"<onclick>"
reader.getFilename()+".lua"
);
button->listenAction([callback](GUI*) {
callback();
@ -156,7 +156,7 @@ static std::shared_ptr<UINode> readTextBox(UiXmlReader& reader, xml::xmlelement
auto consumer = scripting::create_wstring_consumer(
reader.getEnvironment().getId(),
element->attr("consumer").getText(),
reader.getFilename()
reader.getFilename()+"lua"
);
textbox->textConsumer(consumer);
}