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

graph: Remove `step_width` from the hook callback. 

It is always the same as `opts.graph.step_width`, so the extra
callback argument isn't needed.
This commit is contained in:
Emmanuel Lepage Vallee 2021-05-05 01:01:34 -07:00 committed by Alex Belykh
parent 39a6a37bfc
commit 3fd4205b7b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/wibox/widget/graph.lua
View File

@ -349,7 +349,6 @@ local graph = { mt = {} }
-- @tparam number value_y The vertical coordinate corresponding to the drawn value. -- @tparam number value_y The vertical coordinate corresponding to the drawn value.
-- Can be a NaN. -- Can be a NaN.
-- @tparam number baseline_y The vertical coordinate corresponding to the baseline. -- @tparam number baseline_y The vertical coordinate corresponding to the baseline.
-- @tparam number step_width Same as `step_width` (but never nil).
-- @tparam @{draw_callback_options} options Additional info (@{draw_callback_options}). -- @tparam @{draw_callback_options} options Additional info (@{draw_callback_options}).
-- @see step_hook -- @see step_hook
@ -722,14 +721,14 @@ local function graph_draw_values(self, cr, width, height, drawn_values_num)
local pristine_transform = cr:get_matrix() local pristine_transform = cr:get_matrix()
local cairo_translate = cr.translate local cairo_translate = cr.translate
local cairo_set_matrix = cr.set_matrix local cairo_set_matrix = cr.set_matrix
step_hook = function(_, x, value_y, baseline_y, _step_width) step_hook = function(_, x, value_y, baseline_y)
local step_height = baseline_y - value_y local step_height = baseline_y - value_y
if not (step_height == step_height) then if not (step_height == step_height) then
return -- is NaN return -- is NaN
end end
-- Shift to the bar beginning -- Shift to the bar beginning
cairo_translate(cr, x, value_y) cairo_translate(cr, x, value_y)
step_shape(cr, _step_width, step_height) step_shape(cr, step_width, step_height)
-- Undo the shift -- Undo the shift
cairo_set_matrix(cr, pristine_transform) cairo_set_matrix(cr, pristine_transform)
end end
@ -768,7 +767,7 @@ local function graph_draw_values(self, cr, width, height, drawn_values_num)
if step_hook then if step_hook then
-- step_hook() is expected to handle NaNs itself -- step_hook() is expected to handle NaNs itself
step_hook(cr, x, value_y, base_y, step_width, options) step_hook(cr, x, value_y, base_y, options)
elseif not_nan then elseif not_nan then
cairo_rectangle(cr, x, value_y, step_width, base_y - value_y) cairo_rectangle(cr, x, value_y, step_width, base_y - value_y)
end end

7
tests/examples/wibox/widget/graph/bezier_curve.lua
View File

@ -41,8 +41,9 @@ local colors = {
local bezier = require("gears.math.bezier") local bezier = require("gears.math.bezier")
--DOC_NEWLINE --DOC_NEWLINE
local function curvaceous(cr, x, y, b, step_width, options, draw_line) local function curvaceous(cr, x, y, b, options, draw_line)
local interpolate = bezier.cubic_from_derivative_and_points_min_stretch local interpolate = bezier.cubic_from_derivative_and_points_min_stretch
local step_width = options.graph.step_width
local state = options.curvaceous_state local state = options.curvaceous_state
if not state or state.last_group ~= options.group_idx then if not state or state.last_group ~= options.group_idx then
@ -149,9 +150,9 @@ wibox.widget {
stack = false, stack = false,
group_colors = colors, group_colors = colors,
step_width = 15, step_width = 15,
step_hook = function(cr, x, value_y, baseline_y, step_width, options) step_hook = function(cr, x, value_y, baseline_y, options)
-- Draw the curve for the previous step -- Draw the curve for the previous step
curvaceous(cr, x, value_y, baseline_y, step_width, options, true) curvaceous(cr, x, value_y, baseline_y, options, true)
-- Draw a tick for this step -- Draw a tick for this step
if value_y == value_y then if value_y == value_y then
cr:move_to(x, value_y - 2) cr:move_to(x, value_y - 2)