Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

awful.widget.graph: Various minor fixes 

For example, the rightmost pixel of a border-less graph wasn't draw and all
drawing was shifted one pixel to the left.

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2012-06-13 17:59:07 +02:00
parent cafd28027f
commit 7a1acd4a98
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/awful/widget/graph.lua.in
View File

@ -80,7 +80,7 @@ function draw(graph, wibox, cr, width, height)
-- Draw the background first -- Draw the background first
cr:rectangle(border_width, border_width, cr:rectangle(border_width, border_width,
width - (2 * border_width), width - (2 * border_width),
height) height - (2 * border_width))
cr:set_source(color(data[graph].background_color or "#000000aa")) cr:set_source(color(data[graph].background_color or "#000000aa"))
cr:fill() cr:fill()
@ -99,16 +99,16 @@ function draw(graph, wibox, cr, width, height)
for i = 0, width - (2 * border_width) do for i = 0, width - (2 * border_width) do
local rel_i = 0 local rel_i = 0
local rel_x = border_width + i local rel_x = border_width + i + 0.5
if data[graph].stack_colors then if data[graph].stack_colors then
for idx, col in ipairs(data[graph].stack_colors) do for idx, col in ipairs(data[graph].stack_colors) do
local stack_values = values[idx] local stack_values = values[idx]
if stack_values and i < #stack_values then if stack_values and i < #stack_values then
local value = stack_values[#stack_values - i] + rel_i local value = stack_values[#stack_values - i] + rel_i
cr:move_to(rel_x, border_width - 0.5 + cr:move_to(rel_x, border_width +
(height - 2 * border_width) * (1 - (rel_i / max_value))) (height - 2 * border_width) * (1 - (rel_i / max_value)))
cr:line_to(rel_x, border_width - 0.5 + cr:line_to(rel_x, border_width +
(height - 2 * border_width) * (1 - (value / max_value))) (height - 2 * border_width) * (1 - (value / max_value)))
cr:set_source(color(col or "#ff0000")) cr:set_source(color(col or "#ff0000"))
cr:stroke() cr:stroke()
@ -133,9 +133,9 @@ function draw(graph, wibox, cr, width, height)
local value = values[#values - i] local value = values[#values - i]
if value >= 0 then if value >= 0 then
value = value / max_value value = value / max_value
cr:move_to(border_width + i - 0.5, border_width - 0.5 + cr:move_to(border_width + i + 0.5, border_width +
(height - 2 * border_width) * (1 - value)) (height - 2 * border_width) * (1 - value))
cr:line_to(border_width + i - 0.5, border_width + cr:line_to(border_width + i + 0.5, border_width +
(height - 2 * border_width)) (height - 2 * border_width))
end end
end end
@ -184,7 +184,7 @@ local function add_value(graph, value, group)
table.insert(values, value) table.insert(values, value)
local border_width = 0 local border_width = 0
if data[graph].border then border_width = 2 end if data[graph].border_color then border_width = 2 end
-- Ensure we never have more data than we can draw -- Ensure we never have more data than we can draw
while #values > data[graph].width - border_width do while #values > data[graph].width - border_width do