MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't bork on no frame, set cursor to end of text

develop
myk002 2022-07-20 15:36:17 -07:00
parent d9a1104473
commit 9dcb63da53
No known key found for this signature in database
GPG Key ID: 8A39CA0FA0C16E78
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
library/lua/gui/widgets.lua
Unescape Escape View File

@ -121,12 +121,12 @@ ResizingPanel = defclass(ResizingPanel, Panel)
-- adjust our frame dimensions according to positions and sizes of our subviews -- adjust our frame dimensions according to positions and sizes of our subviews
function ResizingPanel:postUpdateLayout(frame_body) function ResizingPanel:postUpdateLayout(frame_body)
local w, h = 0, 0 local w, h = 0, 0
for _,subview in ipairs(self.subviews) do for _,s in ipairs(self.subviews) do
if subview.visible then if s.visible then
w = math.max(w, (subview.frame.l or 0) + w = math.max(w, (s.frame and s.frame.l or 0) +
(subview.frame.w or frame_body.width)) (s.frame and s.frame.w or frame_body.width))
h = math.max(h, (subview.frame.t or 0) + h = math.max(h, (s.frame and s.frame.t or 0) +
(subview.frame.h or frame_body.height)) (s.frame and s.frame.h or frame_body.height))
end end
end end
if not self.frame then self.frame = {} end if not self.frame then self.frame = {} end
@ -191,8 +191,8 @@ EditField.ATTRS{
} }
function EditField:preinit(init_table) function EditField:preinit(init_table)
local frame = init_table.frame or {} init_table.frame = init_table.frame or {}
frame.h = frame.h or 1 init_table.frame.h = init_table.frame.h or 1
end end
function EditField:init() function EditField:init()
@ -202,7 +202,7 @@ function EditField:init()
end end
self.start_pos = 1 self.start_pos = 1
self.cursor = 1 self.cursor = #self.text + 1
self:addviews{HotkeyLabel{frame={t=0,l=0}, self:addviews{HotkeyLabel{frame={t=0,l=0},
key=self.key, key=self.key,