awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2610 from Elv13/arcchat_fixes 

Fix the arcchart rounded edges
This commit is contained in:
Emmanuel Lepage Vallée 2019-01-26 13:04:54 -05:00 committed by GitHub
parent 4c53f9cbc6 dbb552097c
commit d25abddeb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/gears/shape.lua
View File

@ -472,8 +472,11 @@ function module.arc(cr, width, height, thickness, start_angle, end_angle, start_
if end_rounded then if end_rounded then
arc_length = arc_length - thickness/2 arc_length = arc_length - thickness/2
-- And back to angles -- And back to angles. Also make sure to avoid underflowing when the
end_angle = start_angle + (arc_length/(radius - thickness/2)) -- rounded edge radius is greater than the angle delta.
end_angle = start_angle + math.max(
0, arc_length/(radius - thickness/2)
)
end end
-- The path is a curcular arc joining 4 points -- The path is a curcular arc joining 4 points

9
lib/wibox/container/arcchart.lua
View File

@ -104,10 +104,11 @@ function arcchart:after_draw_children(_, cr, width, height)
local max_val = self:get_max_value() local max_val = self:get_max_value()
local sum = 0 local sum = 0
for _, v in ipairs(values) do
sum = sum + v
end
if not max_val then if not max_val then
for _, v in ipairs(values) do
sum = sum + v
end
max_val = sum max_val = sum
end end
@ -131,7 +132,7 @@ function arcchart:after_draw_children(_, cr, width, height)
shape.arc(cr, wa.width-border_width, wa.height-border_width, shape.arc(cr, wa.width-border_width, wa.height-border_width,
thickness+border_width, math.pi-end_angle, math.pi-start_angle, thickness+border_width, math.pi-end_angle, math.pi-start_angle,
(use_rounded_edges and k == 1), (use_rounded_edges and k == #values) (use_rounded_edges and k == #values), (use_rounded_edges and k == 1)
) )
cr:fill() cr:fill()