Minecraft/cc-mek-scada
1
0
Fork 0
mirror of https://github.com/MikaylaFischler/cc-mek-scada.git synced 2024-08-30 18:22:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed offsets/inner width for real this time

Browse Source
This commit is contained in:
Mikayla Fischler 2022-06-25 14:51:38 -04:00
parent 47599b8ff6
commit 6397f29d4f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
graphics/element.lua
View File

@ -49,7 +49,7 @@ function element.new(args)
end end
-- check window -- check window
assert(self.p_window, "graphics.element: no parent window provided") assert(self.p_window, "graphics.element{" .. self.elem_type .. "}: no parent window provided")
-- get frame coordinates/size -- get frame coordinates/size
if args.gframe ~= nil then if args.gframe ~= nil then
@ -83,15 +83,15 @@ function element.new(args)
-- constrain to parent inner width/height -- constrain to parent inner width/height
local w, h = self.p_window.getSize() local w, h = self.p_window.getSize()
f.w = math.min(f.w, w - (2 * offset_x) - f.x) f.w = math.min(f.w, w - ((2 * offset_x) + (f.x - 1)))
f.y = math.min(f.h, h - (2 * offset_y) - f.y) f.h = math.min(f.h, h - ((2 * offset_y) + (f.y - 1)))
end end
-- check frame -- check frame
assert(f.x >= 1, "graphics.element: frame x not >= 1") assert(f.x >= 1, "graphics.element{" .. self.elem_type .. "}: frame x not >= 1")
assert(f.y >= 1, "graphics.element: frame y not >= 1") assert(f.y >= 1, "graphics.element{" .. self.elem_type .. "}: frame y not >= 1")
assert(f.w >= 1, "graphics.element: frame width not >= 1") assert(f.w >= 1, "graphics.element{" .. self.elem_type .. "}: frame width not >= 1")
assert(f.h >= 1, "graphics.element: frame height not >= 1") assert(f.h >= 1, "graphics.element{" .. self.elem_type .. "}: frame height not >= 1")
-- create window -- create window
protected.window = window.create(self.p_window, x, y, f.w, f.h, true) protected.window = window.create(self.p_window, x, y, f.w, f.h, true)