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

Revert "ENH use enum for x/y alignment" 

This reverts commit df16b60f4a.
This commit is contained in:
Nathan Dwarshuis 2021-07-11 18:53:57 -04:00
parent df16b60f4a
commit e72453d79e
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core

@ -1 +1 @@
Subproject commit 6d2b8844900d51d94fdc8cf6e946ffa7ddd464e4 Subproject commit 9e6e960796bd66bc050f2d111ecdab6c309a0874

20
drawing/Common.lua
View File

@ -31,15 +31,15 @@ M.label_font_spec = M.make_font_spec(_G_Patterns_.FONT, 8, false)
M.left_text_style = _G_Widget_.text_style( M.left_text_style = _G_Widget_.text_style(
M.normal_font_spec, M.normal_font_spec,
_G_Patterns_.INACTIVE_TEXT_FG, _G_Patterns_.INACTIVE_TEXT_FG,
_G_Widget_.X_ALIGN.LEFT, 'left',
_G_Widget_.Y_ALIGN.CENTER 'center'
) )
M.right_text_style = _G_Widget_.text_style( M.right_text_style = _G_Widget_.text_style(
M.normal_font_spec, M.normal_font_spec,
_G_Patterns_.PRIMARY_FG, _G_Patterns_.PRIMARY_FG,
_G_Widget_.X_ALIGN.RIGHT, 'right',
_G_Widget_.Y_ALIGN.CENTER 'center'
) )
local _bare_text = function(pt, text, style) local _bare_text = function(pt, text, style)
@ -69,8 +69,8 @@ M.Header = function(x, y, w, s)
_G_Widget_.text_style( _G_Widget_.text_style(
M.make_font_spec(_G_Patterns_.FONT, HEADER_FONT_SIZE, true), M.make_font_spec(_G_Patterns_.FONT, HEADER_FONT_SIZE, true),
_G_Patterns_.HEADER_FG, _G_Patterns_.HEADER_FG,
_G_Widget_.X_ALIGN.LEFT, 'left',
_G_Widget_.Y_ALIGN.TOP 'top'
) )
), ),
bottom_y = bottom_y, bottom_y = bottom_y,
@ -238,8 +238,8 @@ M.initTextRing = function(x, y, r, fmt, limit)
_G_Widget_.text_style( _G_Widget_.text_style(
M.normal_font_spec, M.normal_font_spec,
_G_Patterns_.PRIMARY_FG, _G_Patterns_.PRIMARY_FG,
_G_Widget_.X_ALIGN.MIDDLE, 'center',
_G_Widget_.Y_ALIGN.CENTER 'center'
), ),
fmt, fmt,
_G_Widget_.threshold_text_style( _G_Widget_.threshold_text_style(
@ -321,8 +321,8 @@ M.initTextRowCrit = function(x, y, w, label, append_end, limit)
_G_Widget_.text_style( _G_Widget_.text_style(
M.normal_font_spec, M.normal_font_spec,
_G_Patterns_.PRIMARY_FG, _G_Patterns_.PRIMARY_FG,
_G_Widget_.X_ALIGN.RIGHT, 'right',
_G_Widget_.Y_ALIGN.CENTER 'center'
), ),
append_end, append_end,
_G_Widget_.threshold_text_style( _G_Widget_.threshold_text_style(

4
drawing/FileSystem.lua
View File

@ -75,8 +75,8 @@ local labels = _G_Widget_.TextColumn(
_G_Widget_.text_style( _G_Widget_.text_style(
Common.normal_font_spec, Common.normal_font_spec,
_G_Patterns_.INACTIVE_TEXT_FG, _G_Patterns_.INACTIVE_TEXT_FG,
_G_Widget_.X_ALIGN.LEFT, 'left',
_G_Widget_.Y_ALIGN.CENTER 'center'
), ),
nil, nil,
_SPACING_ _SPACING_

8
drawing/Memory.lua
View File

@ -106,8 +106,8 @@ local cache = {
_G_Widget_.text_style( _G_Widget_.text_style(
Common.normal_font_spec, Common.normal_font_spec,
_G_Patterns_.INACTIVE_TEXT_FG, _G_Patterns_.INACTIVE_TEXT_FG,
_G_Widget_.X_ALIGN.LEFT, 'left',
_G_Widget_.Y_ALIGN.CENTER 'center'
), ),
nil, nil,
_TEXT_SPACING_ _TEXT_SPACING_
@ -121,8 +121,8 @@ local cache = {
_G_Widget_.text_style( _G_Widget_.text_style(
Common.normal_font_spec, Common.normal_font_spec,
_G_Patterns_.SECONDARY_FG, _G_Patterns_.SECONDARY_FG,
_G_Widget_.X_ALIGN.RIGHT, 'right',
_G_Widget_.Y_ALIGN.CENTER 'center'
), ),
'%s%%', '%s%%',
_TEXT_SPACING_ _TEXT_SPACING_