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

REF use new arc api

This commit is contained in:
Nathan Dwarshuis 2021-07-18 19:55:59 -04:00
parent ecf4f73388
commit 38b0aaee27
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core

@ -1 +1 @@
Subproject commit 1f4d9a574c8887e084bb1acbde3dc99392da084c Subproject commit 13ef06edb13e9dbead0745e39e11798f4941b9bc

10
drawing/Common.lua
View File

@ -3,6 +3,8 @@ local M = {}
local Util = require 'Util' local Util = require 'Util'
local Theme = require 'Patterns' local Theme = require 'Patterns'
local Startup = require 'Widget' local Startup = require 'Widget'
local Dial = require 'Dial'
local CompoundDial = require 'CompoundDial'
local Arc = require 'Arc' local Arc = require 'Arc'
local Text = require 'Text' local Text = require 'Text'
local CompoundBar = require 'CompoundBar' local CompoundBar = require 'CompoundBar'
@ -284,7 +286,7 @@ end
-- I have multiple layers on top of each other -- I have multiple layers on top of each other
M.arc = function(x, y, r, thickness, pattern) M.arc = function(x, y, r, thickness, pattern)
return Startup.Arc( return Arc.build(
Startup.make_semicircle(x, y, r, 90, 360), Startup.make_semicircle(x, y, r, 90, 360),
Startup.arc_style(thickness, pattern) Startup.arc_style(thickness, pattern)
) )
@ -294,7 +296,7 @@ end
-- ring -- ring
M.initRing = function(x, y, r) M.initRing = function(x, y, r)
return Startup.Arc( return Arc.build(
Startup.make_semicircle(x, y, r, 0, 360), Startup.make_semicircle(x, y, r, 0, 360),
Startup.arc_style(ARC_WIDTH, Theme.BORDER_FG) Startup.arc_style(ARC_WIDTH, Theme.BORDER_FG)
) )
@ -345,7 +347,7 @@ local threshold_indicator = function(threshold)
end end
M.dial = function(x, y, radius, thickness, threshold) M.dial = function(x, y, radius, thickness, threshold)
return Startup.Dial( return Dial.build(
Startup.make_semicircle(x, y, radius, DIAL_THETA0, DIAL_THETA1), Startup.make_semicircle(x, y, radius, DIAL_THETA0, DIAL_THETA1),
Startup.arc_style(thickness, Theme.INDICATOR_BG), Startup.arc_style(thickness, Theme.INDICATOR_BG),
threshold_indicator(threshold) threshold_indicator(threshold)
@ -357,7 +359,7 @@ end
M.compound_dial = function(x, y, outer_radius, inner_radius, thickness, M.compound_dial = function(x, y, outer_radius, inner_radius, thickness,
threshold, num_dials) threshold, num_dials)
return Startup.CompoundDial( return CompoundDial.build(
Startup.make_semicircle(x, y, outer_radius, DIAL_THETA0, DIAL_THETA1), Startup.make_semicircle(x, y, outer_radius, DIAL_THETA0, DIAL_THETA1),
Startup.arc_style(thickness, Theme.INDICATOR_BG), Startup.arc_style(thickness, Theme.INDICATOR_BG),
threshold_indicator(threshold), threshold_indicator(threshold),