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

ENH use separate fun for threshold text

This commit is contained in:
Nathan Dwarshuis 2021-07-10 19:44:32 -04:00
parent b057d98cdd
commit 05cf19973e
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core

@ -1 +1 @@
Subproject commit fe7f073acd35fea54ecba747dd6d0bff708143a0 Subproject commit 142089daafbe15d56cdc55d66263644656a0aeec

13
drawing/Common.lua
View File

@ -143,15 +143,10 @@ M.initPercentPlot = function(x, y, w, h, spacing, label)
-- font_spec = M.normal_font_spec, -- font_spec = M.normal_font_spec,
-- }, -- },
label = _left_text(_G_Widget_.make_point(x, y), label), label = _left_text(_G_Widget_.make_point(x, y), label),
value = _G_Widget_.CriticalText( value = _G_Widget_.formattedThresholdText(
_G_Widget_.make_point(x + w, y), _G_Widget_.make_point(x + w, y),
nil, nil,
_G_Widget_.text_style( M.right_text_style,
M.normal_font_spec,
_G_Patterns_.PRIMARY_FG,
'right',
'center'
),
_G_Widget_.text_format( _G_Widget_.text_format(
'%s%%', '%s%%',
false false
@ -290,7 +285,7 @@ M.initTextRing = function(x, y, r, fmt, limit)
-- critical_color = _G_Patterns_.CRITICAL_FG, -- critical_color = _G_Patterns_.CRITICAL_FG,
-- font_spec = M.normal_font_spec, -- font_spec = M.normal_font_spec,
-- }, -- },
value = _G_Widget_.CriticalText( value = _G_Widget_.formattedThresholdText(
_G_Widget_.make_point(x, y), _G_Widget_.make_point(x, y),
nil, nil,
_G_Widget_.text_style( _G_Widget_.text_style(
@ -411,7 +406,7 @@ M.initTextRowCrit = function(x, y, w, label, append_end, limit)
-- text = '<NA>', -- text = '<NA>',
-- font_spec = M.normal_font_spec, -- font_spec = M.normal_font_spec,
-- } -- }
value = _G_Widget_.CriticalText( value = _G_Widget_.formattedThresholdText(
_G_Widget_.make_point(x + w, y), _G_Widget_.make_point(x + w, y),
nil, nil,
_G_Widget_.text_style( _G_Widget_.text_style(