From 4e382c7b3b543193722a853d13a5e303309166c9 Mon Sep 17 00:00:00 2001 From: myk002 Date: Sun, 17 Jul 2022 16:04:36 -0700 Subject: [PATCH] make HotkeyLabels react to clicking also be better about initializing EditField frame height --- library/lua/gui/widgets.lua | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua index f4573a185..aea62bf87 100644 --- a/library/lua/gui/widgets.lua +++ b/library/lua/gui/widgets.lua @@ -187,10 +187,14 @@ EditField.ATTRS{ on_submit2 = DEFAULT_NIL, key = DEFAULT_NIL, key_sep = DEFAULT_NIL, - frame = {h=1}, modal = false, } +function EditField:preinit(init_table) + local frame = init_table.frame or {} + frame.h = frame.h or 1 +end + function EditField:init() local function on_activate() self.saved_text = self.text @@ -744,6 +748,16 @@ function HotkeyLabel:init() on_activate=self.on_activate}} 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 -- ----------------------