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

Fix compatibility with LGI 0.9 

Also add a 1px padding for checkboxes
This commit is contained in:
Emmanuel Lepage Vallee 2016-02-19 03:29:40 -05:00
parent 760bc05da4
commit dafac374fa
2 changed files with 2 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
widgets/checkbox.lua
View File

@ -1,120 +0,0 @@
local setmetatable = setmetatable
local color = require("gears.color")
local cairo = require("lgi").cairo
local beautiful = require("beautiful")
local module = {}
local checkedI
local notcheckedI
local isinit = false
-- Default checkbox style
local function default()
local size = beautiful.menu_height or 16
local x_padding = 3
local sp = size * (beautiful.menu_checkbox_padding or 0.08)
local rs = size - (2 * sp)
notcheckedI = cairo.ImageSurface(cairo.Format.ARGB32, size, size)
checkedI = cairo.ImageSurface(cairo.Format.ARGB32, size, size)
-- Checked
local cr = cairo.Context(checkedI)
cr:set_operator(cairo.Operator.CLEAR)
cr:paint()
cr:set_operator(cairo.Operator.SOURCE)
cr:set_line_width(1)
cr:set_source(color(beautiful.menu_checkbox_color or beautiful.fg_normal))
cr:move_to(sp, sp);cr:line_to(rs, sp)
cr:move_to(sp, sp);cr:line_to(sp, rs)
cr:move_to(sp, rs);cr:line_to(rs, rs)
cr:move_to(rs, sp);cr:line_to(rs, rs)
cr:stroke()
cr:set_line_width(2)
cr:set_source(color(beautiful.menu_checkbox_checked_color or beautiful.fg_normal))
cr:move_to(sp + x_padding, sp + x_padding);cr:line_to(rs - x_padding, rs - x_padding)
cr:move_to(sp + x_padding, rs - x_padding);cr:line_to(rs - x_padding, sp + x_padding)
cr:stroke()
-- Unchecked
local cr2 = cairo.Context(notcheckedI)
cr2:set_operator(cairo.Operator.CLEAR)
cr2:paint()
cr2:set_operator(cairo.Operator.SOURCE)
cr2:set_line_width(1)
cr2:set_source(color(beautiful.menu_checkbox_color or beautiful.fg_normal))
cr2:move_to(sp, sp);cr2:line_to(rs, sp)
cr2:move_to(sp, sp);cr2:line_to(sp, rs)
cr2:move_to(sp, rs);cr2:line_to(rs, rs)
cr2:move_to(rs, sp);cr2:line_to(rs, rs)
cr2:stroke()
isinit = true
end
-- Holo checkbox style
local function holo()
local size = (beautiful.menu_height or 16)
local x_padding = 3
local padding = size * (beautiful.menu_checkbox_padding or 0.08)
notcheckedI = cairo.ImageSurface(cairo.Format.ARGB32, size, size)
checkedI = cairo.ImageSurface(cairo.Format.ARGB32, size, size)
size = (size-(2*padding))/2
-- Unchecked
local cr2 = cairo.Context(notcheckedI)
cr2:set_operator(cairo.Operator.CLEAR)
cr2:paint()
cr2:set_operator(cairo.Operator.SOURCE)
cr2:set_source(color(beautiful.menu_checkbox_color or beautiful.fg_normal))
cr2:set_line_width(1)
cr2:arc(size+1, size+1, size, 0, math.pi*2)
cr2:stroke()
-- Checked
local cr = cairo.Context(checkedI)
cr:set_operator(cairo.Operator.CLEAR)
cr:paint()
cr:set_operator(cairo.Operator.SOURCE)
cr:set_line_width(1)
cr:set_source(color(beautiful.menu_checkbox_color or beautiful.fg_normal))
cr:arc(size+1, size+1, size, 0, math.pi*2)
cr:stroke()
cr:set_source(color(beautiful.menu_checkbox_checked_color or beautiful.fg_normal))
cr:arc(size+1, size+1, size-x_padding, 0, math.pi*2)
cr:fill()
isinit = true
end
local style = {
holo = holo,
default = default,
}
function module.checked()
if not isinit then
style[beautiful.menu_checkbox_style or "default"]()
end
return checkedI
end
function module.unchecked()
if not isinit then
style[beautiful.menu_checkbox_style or "default"]()
end
return notcheckedI
end
return setmetatable(module, { __call = function(_, ...) return new(...) end })

3
widgets/piechart.lua
View File

@ -13,7 +13,8 @@ local function draw_label(cr,angle,radius,center_x,center_y,text)
cr:line_to(center_x+(1.5*radius)*math.cos(angle),center_y+(1.5*radius)*math.sin(angle))
local x,y = cr:get_current_point()
cr:line_to(x+(x>center_x and radius/2 or -radius/2),y)
cr:move_to(x+(x>center_x and radius/2 + 5 or (-radius/2 - cr:text_extents(text).width - 5)),y+(cr.font_extents.height/4))
local extents = cr:font_extents()
cr:move_to(x+(x>center_x and radius/2 + 5 or (-radius/2 - cr:text_extents(text).width - 5)),y+(extents.height/4))
cr:show_text(text)
cr:stroke()
cr:arc(center_x+(radius/2)*math.cos(angle),center_y+(radius/2)*math.sin(angle),2,0,2*math.pi)