REF use arc style

This commit is contained in:
Nathan Dwarshuis 2021-07-10 14:43:20 -04:00
parent e02a5eacef
commit 95d7abbd9e
3 changed files with 19 additions and 13 deletions

2
core

@ -1 +1 @@
Subproject commit fe14fdce991242f892d4e47651c47d30687a9b52 Subproject commit 74aa89b9f069b46559b8652d7627dfc4b34efd58

View File

@ -81,11 +81,11 @@ M.Header = function(x, y, w, s)
-- cap = HEADER_UNDERLINE_CAP -- cap = HEADER_UNDERLINE_CAP
-- } -- }
underline = _G_Widget_.Line( underline = _G_Widget_.Line(
{x = x, y = underline_y},
{x = x + w, y = underline_y},
HEADER_UNDERLINE_THICKNESS, HEADER_UNDERLINE_THICKNESS,
HEADER_UNDERLINE_CAP, HEADER_UNDERLINE_CAP,
_G_Patterns_.HEADER_FG, _G_Patterns_.HEADER_FG
{x = x, y = underline_y},
{x = x + w, y = underline_y}
) )
} }
@ -257,9 +257,11 @@ M.initRing = function(x, y, r)
0, 0,
360 360
), ),
_G_Widget_.arc_style(
2, 2,
_G_Patterns_.BORDER_FG _G_Patterns_.BORDER_FG
) )
)
end end
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
@ -316,11 +318,11 @@ M.initSeparator = function(x, y, w)
-- line_pattern = _G_Patterns_.BORDER_FG, -- line_pattern = _G_Patterns_.BORDER_FG,
-- } -- }
return _G_Widget_.Line( return _G_Widget_.Line(
{x = x, y = y},
{x = x + w, y = y},
1, 1,
CAIRO_LINE_CAP_BUTT, CAIRO_LINE_CAP_BUTT,
_G_Patterns_.BORDER_FG, _G_Patterns_.BORDER_FG
{x = x, y = y},
{x = x + w, y = y}
) )
end end

View File

@ -61,8 +61,10 @@ local dial = _G_Widget_.Dial(
90, 90,
360 360
), ),
_G_Widget_.arc_style(
_DIAL_THICKNESS_, _DIAL_THICKNESS_,
_G_Patterns_.INDICATOR_BG, _G_Patterns_.INDICATOR_BG
),
_G_Patterns_.INDICATOR_FG_PRIMARY, _G_Patterns_.INDICATOR_FG_PRIMARY,
_G_Patterns_.INDICATOR_FG_CRITICAL, _G_Patterns_.INDICATOR_FG_CRITICAL,
0.8 0.8
@ -74,8 +76,10 @@ local cache_arc = _G_Widget_.Arc(
90, 90,
360 360
), ),
_G_Widget_.arc_style(
_DIAL_THICKNESS_, _DIAL_THICKNESS_,
_G_Patterns_.INDICATOR_FG_SECONDARY _G_Patterns_.INDICATOR_FG_SECONDARY
)
) )
local text_ring = Common.initTextRing( local text_ring = Common.initTextRing(