diff options
author | David Walter Seikel | 2014-04-20 05:13:38 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-04-20 05:13:38 +1000 |
commit | 9ce86c55c6eecb522024529bc42ee81cf3ad3672 (patch) | |
tree | a8d76ba47b0b9085ca857d7af748aeb9034516a5 /ClientHamr | |
parent | Add the next broken test. (diff) | |
download | SledjHamr-9ce86c55c6eecb522024529bc42ee81cf3ad3672.zip SledjHamr-9ce86c55c6eecb522024529bc42ee81cf3ad3672.tar.gz SledjHamr-9ce86c55c6eecb522024529bc42ee81cf3ad3672.tar.bz2 SledjHamr-9ce86c55c6eecb522024529bc42ee81cf3ad3672.tar.xz |
Let actions and other stuff set in the thingasm() call work through their isValid().
Diffstat (limited to 'ClientHamr')
-rw-r--r-- | ClientHamr/GuiLua/skang.lua | 6 | ||||
-rw-r--r-- | ClientHamr/GuiLua/test.skang | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/ClientHamr/GuiLua/skang.lua b/ClientHamr/GuiLua/skang.lua index fdd61de..74bebd4 100644 --- a/ClientHamr/GuiLua/skang.lua +++ b/ClientHamr/GuiLua/skang.lua | |||
@@ -881,9 +881,9 @@ thingasm = function (names, ...) | |||
881 | local args, err = loadstring('return ' .. thingy.widget) | 881 | local args, err = loadstring('return ' .. thingy.widget) |
882 | if args then | 882 | if args then |
883 | setfenv(args, parent) | 883 | setfenv(args, parent) |
884 | local result = widget(args()) | 884 | thingy.Cwidget = widget(args()) |
885 | print('NO IDEA WHY this does isValid() three times on the action, and the first one being a string.') | 885 | print('\nNO IDEA WHY this does isValid() three times on the action, and the first one being a string.') |
886 | parent.W[name] = {Cwidget = result} | 886 | parent.W[name] = thingy |
887 | else | 887 | else |
888 | print("ERROR - " .. err) | 888 | print("ERROR - " .. err) |
889 | end | 889 | end |
diff --git a/ClientHamr/GuiLua/test.skang b/ClientHamr/GuiLua/test.skang index 432ab71..518207b 100644 --- a/ClientHamr/GuiLua/test.skang +++ b/ClientHamr/GuiLua/test.skang | |||
@@ -11,7 +11,6 @@ skang.thingasm{win, 'quitter', 'Quits the skang window', types = 'widget', widge | |||
11 | win.W.quitter.action = 'skang.quit()' -- TODO Should look it up in ThingSpace.commands, and translat 'quit' into the Lua 'skang.quit()'? | 11 | win.W.quitter.action = 'skang.quit()' -- TODO Should look it up in ThingSpace.commands, and translat 'quit' into the Lua 'skang.quit()'? |
12 | 12 | ||
13 | skang.thingasm{win, 'ffuncer', 'Calls ffunc', types = 'widget', widget='"button", "ffunc()", 10, 40, 100, 30', action='test.ffunc(3, 4)'} | 13 | skang.thingasm{win, 'ffuncer', 'Calls ffunc', types = 'widget', widget='"button", "ffunc()", 10, 40, 100, 30', action='test.ffunc(3, 4)'} |
14 | win.W.ffuncer.action = 'test.ffunc(3, 4)' | ||
15 | 14 | ||
16 | --other.foo = 'stuff' | 15 | --other.foo = 'stuff' |
17 | this.bar = 'things' | 16 | this.bar = 'things' |