REF use new rect api

This commit is contained in:
Nathan Dwarshuis 2021-07-18 20:22:30 -04:00
parent 0b2b91b3e1
commit be63d5b13b
2 changed files with 6 additions and 4 deletions

2
core

@ -1 +1 @@
Subproject commit b9c3881e2aaf27bc30c60580bf162ce25a929a4f Subproject commit 3fff6b06be21330a2b42c61c273ea2bd9bf782b0

View File

@ -4,6 +4,8 @@ local Util = require 'Util'
local Theme = require 'Patterns' local Theme = require 'Patterns'
local Startup = require 'Widget' local Startup = require 'Widget'
local Dial = require 'Dial' local Dial = require 'Dial'
local Rect = require 'Rect'
local FillRect = require 'FillRect'
local CompoundDial = require 'CompoundDial' local CompoundDial = require 'CompoundDial'
local Arc = require 'Arc' local Arc = require 'Arc'
local Text = require 'Text' local Text = require 'Text'
@ -553,7 +555,7 @@ end
M.default_table_font_spec = M.make_font_spec(FONT, TABLE_FONT_SIZE, false) M.default_table_font_spec = M.make_font_spec(FONT, TABLE_FONT_SIZE, false)
M.default_table_style = Startup.table_style( M.default_table_style = Startup.table_style(
Startup.rect_style( Rect.style(
TABLE_LINE_THICKNESS, TABLE_LINE_THICKNESS,
Theme.BORDER_FG Theme.BORDER_FG
), ),
@ -593,9 +595,9 @@ end
-- panel -- panel
M.initPanel = function(x, y, w, h, thickness) M.initPanel = function(x, y, w, h, thickness)
return Startup.FillRect( return FillRect.build(
Startup.make_box(x, y, w, h), Startup.make_box(x, y, w, h),
Startup.rect_style(thickness, Theme.BORDER_FG), Rect.style(thickness, Theme.BORDER_FG),
Theme.PANEL_BG Theme.PANEL_BG
) )
end end