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

REF update core

This commit is contained in:
Nathan Dwarshuis 2021-08-06 23:41:17 -04:00
parent d4a4b190e0
commit 15dc15f534
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core

@ -1 +1 @@
Subproject commit 3ed05d94135cbd773bbc14c115304f6c753444f7 Subproject commit 958f836bebece975a212d756c56f3de17c2ac6ce

24
drawing/common.lua
View File

@ -8,6 +8,7 @@ local rect = require 'rect'
local fillrect = require 'fillrect' local fillrect = require 'fillrect'
local compounddial = require 'compounddial' local compounddial = require 'compounddial'
local arc = require 'arc' local arc = require 'arc'
local circle = require 'circle'
local text = require 'text' local text = require 'text'
local tbl = require 'texttable' local tbl = require 'texttable'
local compoundbar = require 'compoundbar' local compoundbar = require 'compoundbar'
@ -51,6 +52,13 @@ local ARC_WIDTH = 2
local DIAL_THETA0 = 90 local DIAL_THETA0 = 90
local DIAL_THETA1 = 360 local DIAL_THETA1 = 360
--------------------------------------------------------------------------------
-- line helper functions
local _make_horizontal_line = function(x, y, w)
return F.make_line(F.make_point(x, y), F.make_point(x + w, y))
end
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
-- text helper functions -- text helper functions
@ -181,8 +189,7 @@ M.make_header = function(x, y, w, _text)
), ),
bottom_y = bottom_y, bottom_y = bottom_y,
underline = line.make( underline = line.make(
F.make_point(x, underline_y), _make_horizontal_line(x, underline_y, w),
F.make_point(x + w, underline_y),
line.config( line.config(
style.line(HEADER_UNDERLINE_THICKNESS, HEADER_UNDERLINE_CAP), style.line(HEADER_UNDERLINE_THICKNESS, HEADER_UNDERLINE_CAP),
theme.HEADER_FG, theme.HEADER_FG,
@ -347,9 +354,9 @@ end
-- circle -- circle
M.make_circle = function(x, y, r) M.make_circle = function(x, y, r)
return arc.make( return circle.make(
F.make_semicircle(x, y, r, 0, 360), F.make_circle(x, y, r),
arc.config(style.line(ARC_WIDTH, CAIRO_LINE_CAP_BUTT), theme.BORDER_FG) circle.config(style.line(ARC_WIDTH, CAIRO_LINE_CAP_BUTT), theme.BORDER_FG)
) )
end end
@ -395,7 +402,7 @@ end
M.make_dial = function(x, y, radius, thickness, threshold, format) M.make_dial = function(x, y, radius, thickness, threshold, format)
return { return {
dial = dial.make( dial = dial.make(
F.make_semicircle(x, y, radius, DIAL_THETA0, DIAL_THETA1), F.make_arc(x, y, radius, DIAL_THETA0, DIAL_THETA1),
arc.config(style.line(thickness, CAIRO_LINE_CAP_BUTT), theme.INDICATOR_BG), arc.config(style.line(thickness, CAIRO_LINE_CAP_BUTT), theme.INDICATOR_BG),
threshold_indicator(threshold) threshold_indicator(threshold)
), ),
@ -424,7 +431,7 @@ end
M.make_compound_dial = function(x, y, outer_radius, inner_radius, thickness, M.make_compound_dial = function(x, y, outer_radius, inner_radius, thickness,
threshold, num_dials) threshold, num_dials)
return compounddial.make( return compounddial.make(
F.make_semicircle(x, y, outer_radius, DIAL_THETA0, DIAL_THETA1), F.make_arc(x, y, outer_radius, DIAL_THETA0, DIAL_THETA1),
arc.config(style.line(thickness, CAIRO_LINE_CAP_BUTT), theme.INDICATOR_BG), arc.config(style.line(thickness, CAIRO_LINE_CAP_BUTT), theme.INDICATOR_BG),
threshold_indicator(threshold), threshold_indicator(threshold),
inner_radius, inner_radius,
@ -478,8 +485,7 @@ end
M.make_separator = function(x, y, w) M.make_separator = function(x, y, w)
return line.make( return line.make(
F.make_point(x, y), _make_horizontal_line(x, y, w),
F.make_point(x + w, y),
line.config( line.config(
style.line(SEPARATOR_THICKNESS, CAIRO_LINE_CAP_BUTT), style.line(SEPARATOR_THICKNESS, CAIRO_LINE_CAP_BUTT),
theme.BORDER_FG, theme.BORDER_FG,