|
|
@ -187,10 +187,14 @@ EditField.ATTRS{
|
|
|
|
on_submit2 = DEFAULT_NIL,
|
|
|
|
on_submit2 = DEFAULT_NIL,
|
|
|
|
key = DEFAULT_NIL,
|
|
|
|
key = DEFAULT_NIL,
|
|
|
|
key_sep = DEFAULT_NIL,
|
|
|
|
key_sep = DEFAULT_NIL,
|
|
|
|
frame = {h=1},
|
|
|
|
|
|
|
|
modal = false,
|
|
|
|
modal = false,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
function EditField:preinit(init_table)
|
|
|
|
|
|
|
|
local frame = init_table.frame or {}
|
|
|
|
|
|
|
|
frame.h = frame.h or 1
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
function EditField:init()
|
|
|
|
function EditField:init()
|
|
|
|
local function on_activate()
|
|
|
|
local function on_activate()
|
|
|
|
self.saved_text = self.text
|
|
|
|
self.saved_text = self.text
|
|
|
@ -744,6 +748,16 @@ function HotkeyLabel:init()
|
|
|
|
on_activate=self.on_activate}}
|
|
|
|
on_activate=self.on_activate}}
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
function HotkeyLabel:onInput(keys)
|
|
|
|
|
|
|
|
if HotkeyLabel.super.onInput(self, keys) then
|
|
|
|
|
|
|
|
return true
|
|
|
|
|
|
|
|
elseif keys._MOUSE_L and self:getMousePos() then
|
|
|
|
|
|
|
|
self.on_activate()
|
|
|
|
|
|
|
|
return true
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
----------------------
|
|
|
|
----------------------
|
|
|
|
-- CycleHotkeyLabel --
|
|
|
|
-- CycleHotkeyLabel --
|
|
|
|
----------------------
|
|
|
|
----------------------
|
|
|
|