GitHub/cc-scada
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#243 changed rectangle to use content window, significant simplification of offset logic, improved delete rendering

Browse Source
This commit is contained in:
Mikayla Fischler
2023-05-30 20:43:33 -04:00
parent de9cb3bd3a
commit 4c35233289
8 changed files with 31 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
graphics/elements/displaybox.lua
View File

@@ -4,6 +4,7 @@ local element = require("graphics.element")
---@class displaybox_args
---@field window table
---@field id? string element id
---@field x? integer 1 if omitted
---@field y? integer 1 if omitted
---@field width? integer parent width if omitted
@@ -15,6 +16,7 @@ local element = require("graphics.element")
-- new root display box
---@nodiscard
---@param args displaybox_args
---@return graphics_element element, element_id id
local function displaybox(args)
-- create new graphics element base object
return element.new(args).complete()

18
graphics/elements/rectangle.lua
View File

@@ -31,27 +31,35 @@ local function rectangle(args)
end
-- offset children
local offset_x = 0
local offset_y = 0
if args.border ~= nil then
args.offset_x = args.border.width
args.offset_y = args.border.width
offset_x = args.border.width
offset_y = args.border.width
-- slightly different y offset if the border is set to even
if args.border.even then
local width_x2 = (2 * args.border.width)
args.offset_y = math.floor(width_x2 / 3) + util.trinary(width_x2 % 3 > 0, 1, 0)
offset_y = math.floor(width_x2 / 3) + util.trinary(width_x2 % 3 > 0, 1, 0)
end
end
-- create new graphics element base object
local e = element.new(args)
-- create content window for child elements
e.content_window = window.create(e.window, 1 + offset_x, 1 + offset_y, e.frame.w - (2 * offset_x), e.frame.h - (2 * offset_y))
e.content_window.setBackgroundColor(e.fg_bg.bkg)
e.content_window.setTextColor(e.fg_bg.fgd)
e.content_window.clear()
-- draw bordered box if requested
-- element constructor will have drawn basic colored rectangle regardless
if args.border ~= nil then
e.window.setCursorPos(1, 1)
local border_width = args.offset_x
local border_height = args.offset_y
local border_width = offset_x
local border_height = offset_y
local border_blit = colors.toBlit(args.border.color)
local width_x2 = border_width * 2
local inner_width = e.frame.w - width_x2