From 38b0aaee27c9520de2f4220e0d3361fc3f0cfb1f Mon Sep 17 00:00:00 2001 From: ndwarshuis Date: Sun, 18 Jul 2021 19:55:59 -0400 Subject: [PATCH] REF use new arc api --- core | 2 +- drawing/Common.lua | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/core b/core index 1f4d9a5..13ef06e 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 1f4d9a574c8887e084bb1acbde3dc99392da084c +Subproject commit 13ef06edb13e9dbead0745e39e11798f4941b9bc diff --git a/drawing/Common.lua b/drawing/Common.lua index 8f69a12..28af0fe 100644 --- a/drawing/Common.lua +++ b/drawing/Common.lua @@ -3,6 +3,8 @@ local M = {} local Util = require 'Util' local Theme = require 'Patterns' local Startup = require 'Widget' +local Dial = require 'Dial' +local CompoundDial = require 'CompoundDial' local Arc = require 'Arc' local Text = require 'Text' local CompoundBar = require 'CompoundBar' @@ -284,7 +286,7 @@ end -- I have multiple layers on top of each other M.arc = function(x, y, r, thickness, pattern) - return Startup.Arc( + return Arc.build( Startup.make_semicircle(x, y, r, 90, 360), Startup.arc_style(thickness, pattern) ) @@ -294,7 +296,7 @@ end -- ring M.initRing = function(x, y, r) - return Startup.Arc( + return Arc.build( Startup.make_semicircle(x, y, r, 0, 360), Startup.arc_style(ARC_WIDTH, Theme.BORDER_FG) ) @@ -345,7 +347,7 @@ local threshold_indicator = function(threshold) end 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.arc_style(thickness, Theme.INDICATOR_BG), threshold_indicator(threshold) @@ -357,7 +359,7 @@ end M.compound_dial = function(x, y, outer_radius, inner_radius, thickness, threshold, num_dials) - return Startup.CompoundDial( + return CompoundDial.build( Startup.make_semicircle(x, y, outer_radius, DIAL_THETA0, DIAL_THETA1), Startup.arc_style(thickness, Theme.INDICATOR_BG), threshold_indicator(threshold),