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

REF use new line/bar api

This commit is contained in:
Nathan Dwarshuis 2021-07-18 20:14:00 -04:00
parent 83374784d7
commit 0b2b91b3e1
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core

@ -1 +1 @@
Subproject commit 580ee5cabaf0288d0222d1efe439908f8975a7bb Subproject commit b9c3881e2aaf27bc30c60580bf162ce25a929a4f

14
drawing/Common.lua
View File

@ -99,10 +99,10 @@ M.Header = function(x, y, w, s)
) )
), ),
bottom_y = bottom_y, bottom_y = bottom_y,
underline = Startup.Line( underline = Line.build(
Startup.make_point(x, underline_y), Startup.make_point(x, underline_y),
Startup.make_point(x + w, underline_y), Startup.make_point(x + w, underline_y),
Startup.line_style( Line.style(
HEADER_UNDERLINE_THICKNESS, HEADER_UNDERLINE_THICKNESS,
Theme.HEADER_FG, Theme.HEADER_FG,
HEADER_UNDERLINE_CAP HEADER_UNDERLINE_CAP
@ -380,10 +380,10 @@ M.compound_bar = function(x, y, w, pad, labels, spacing, thickness, threshold)
nil, nil,
spacing spacing
), ),
bars = Startup.CompoundBar( bars = CompoundBar.build(
Startup.make_point(x + pad, y), Startup.make_point(x + pad, y),
w - pad, w - pad,
Startup.line_style( Line.style(
thickness, thickness,
Theme.INDICATOR_BG, Theme.INDICATOR_BG,
CAIRO_LINE_JOIN_MITER CAIRO_LINE_JOIN_MITER
@ -413,10 +413,10 @@ end
-- separator (eg a horizontal line) -- separator (eg a horizontal line)
M.initSeparator = function(x, y, w) M.initSeparator = function(x, y, w)
return Startup.Line( return Line.build(
Startup.make_point(x, y), Startup.make_point(x, y),
Startup.make_point(x + w, y), Startup.make_point(x + w, y),
Startup.line_style( Line.style(
SEPARATOR_THICKNESS, SEPARATOR_THICKNESS,
Theme.BORDER_FG, Theme.BORDER_FG,
CAIRO_LINE_CAP_BUTT CAIRO_LINE_CAP_BUTT
@ -557,7 +557,7 @@ M.default_table_style = Startup.table_style(
TABLE_LINE_THICKNESS, TABLE_LINE_THICKNESS,
Theme.BORDER_FG Theme.BORDER_FG
), ),
Startup.line_style( Line.style(
TABLE_LINE_THICKNESS, TABLE_LINE_THICKNESS,
Theme.BORDER_FG, Theme.BORDER_FG,
CAIRO_LINE_CAP_BUTT CAIRO_LINE_CAP_BUTT