ndwarshuis
/
conky-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH don't unnecessarilty make point for box

This commit is contained in:
Nathan Dwarshuis 2021-07-11 18:12:39 -04:00
parent 073e7239d1
commit a5af4f9200
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core

@ -1 +1 @@
Subproject commit b3e511fb82aa9886b8f24f520fce2c3cb8473121 Subproject commit db3924e25d98b942b4bc9fe81cb8bb8ada8a1fb1

18
drawing/Common.lua
View File

@ -115,7 +115,7 @@ M.percent_label_style = _G_Widget_.label_style(
M.initThemedLabelPlot = function(x, y, w, h, label_style) M.initThemedLabelPlot = function(x, y, w, h, label_style)
return _G_Widget_.LabelPlot( return _G_Widget_.LabelPlot(
_G_Widget_.make_box(_G_Widget_.make_point(x, y), w, h), _G_Widget_.make_box(x, y, w, h),
M.default_plot_style, M.default_plot_style,
label_style label_style
) )
@ -169,7 +169,7 @@ M.base_2_scale_data = _G_Widget_.scale_data(2, 1, 0.9)
M.initThemedScalePlot = function(x, y, w, h, f) M.initThemedScalePlot = function(x, y, w, h, f)
return _G_Widget_.ScalePlot( return _G_Widget_.ScalePlot(
_G_Widget_.make_box(_G_Widget_.make_point(x, y), w, h), _G_Widget_.make_box(x, y, w, h),
M.default_plot_style, M.default_plot_style,
_G_Widget_.label_style( _G_Widget_.label_style(
_G_Patterns_.INACTIVE_TEXT_FG, _G_Patterns_.INACTIVE_TEXT_FG,
@ -314,7 +314,6 @@ end
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
-- text row with critical indicator -- text row with critical indicator
-- TODO add limit to this
M.initTextRowCrit = function(x, y, w, label, append_end, limit) M.initTextRowCrit = function(x, y, w, label, append_end, limit)
return{ return{
label = _left_text( label = _left_text(
@ -413,7 +412,7 @@ M.default_table_style = _G_Widget_.table_style(
M.initTable = function(x, y, w, h, n, labels) M.initTable = function(x, y, w, h, n, labels)
return _G_Widget_.Table( return _G_Widget_.Table(
_G_Widget_.make_box(_G_Widget_.make_point(x, y), w, h), _G_Widget_.make_box(x, y, w, h),
n, n,
labels, labels,
M.default_table_style M.default_table_style
@ -425,15 +424,8 @@ end
M.initPanel = function(x, y, w, h, thickness) M.initPanel = function(x, y, w, h, thickness)
return _G_Widget_.FillRect( return _G_Widget_.FillRect(
_G_Widget_.make_box( _G_Widget_.make_box(x, y, w, h),
_G_Widget_.make_point(x, y), _G_Widget_.rect_style(thickness, _G_Patterns_.BORDER_FG),
w,
h
),
_G_Widget_.rect_style(
thickness,
_G_Patterns_.BORDER_FG
),
_G_Patterns_.PANEL_BG _G_Patterns_.PANEL_BG
) )
end end

1
main.lua
View File

@ -195,7 +195,6 @@ _G_Patterns_ = nil
_unrequire('Super') _unrequire('Super')
_unrequire('Color') _unrequire('Color')
_unrequire('Gradient')
_unrequire('Widget') _unrequire('Widget')
_unrequire('Patterns') _unrequire('Patterns')