From 2965bae338450da0cf5b227dca817705b7894ac0 Mon Sep 17 00:00:00 2001 From: ndwarshuis Date: Sat, 10 Jul 2021 00:22:02 -0400 Subject: [PATCH] REF use box in rect and fillrect --- core | 2 +- drawing/Common.lua | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/core b/core index 6ed1687..f59ee91 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 6ed168732ff88826ee58ae2729703b9d12c2fb77 +Subproject commit f59ee91926fc9b51cb664712127c87dde43500fd diff --git a/drawing/Common.lua b/drawing/Common.lua index 9c66b36..c434529 100644 --- a/drawing/Common.lua +++ b/drawing/Common.lua @@ -516,14 +516,16 @@ end -- panel M.initPanel = function(x, y, w, h) - return _G_Widget_.FillRect{ - x = x + 0.5, - y = y + 0.5, - width = w, - height = h, - line_pattern = _G_Patterns_.BORDER_FG, - fill_pattern = _G_Patterns_.PANEL_BG, - } + return _G_Widget_.FillRect( + _G_Widget_.make_box( + _G_Widget_.make_point(x + 0.5, y + 0.5), + w, + h + ), + 1, + _G_Patterns_.BORDER_FG, + _G_Patterns_.PANEL_BG + ) end return M