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

background: Update all users so they don't use the deprecated name. 

This is done before deprecating the API so no commit ever use the
deprecated name.
This commit is contained in:
Emmanuel Lepage Vallee 2019-04-05 16:52:01 -04:00
parent 81ff4d730c
commit eb1c45b656
11 changed files with 85 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/awful/tooltip.lua
View File

@ -465,7 +465,7 @@ end
-- @param number
function tooltip:set_border_width(val)
self.widget.shape_border_width = val
self.widget.border_width = val
end
--- The border color.
@ -476,7 +476,7 @@ end
-- @param gears.color
function tooltip:set_border_color(val)
self.widget.shape_border_color = val
self.widget.border_color = val
end
--- Set the margins around the left and right of the tooltip textbox
@ -679,23 +679,23 @@ function tooltip.new(args)
self.widget = wibox.widget {
{
{
id = 'text_role',
font = font,
id = 'text_role',
font = font,
widget = wibox.widget.textbox,
},
id = 'margin_role',
left = m_lr,
right = m_lr,
top = m_tb,
id = 'margin_role',
left = m_lr,
right = m_lr,
top = m_tb,
bottom = m_tb,
widget = wibox.container.margin,
},
id = 'background_role',
bg = bg,
shape = self._private.shape,
shape_border_width = border_width,
shape_border_color = border_color,
widget = wibox.container.background,
id = 'background_role',
bg = bg,
shape = self._private.shape,
border_width = border_width,
border_color = border_color,
widget = wibox.container.background,
}
self.textbox = self.widget:get_children_by_id('text_role')[1]
self.marginbox = self.widget:get_children_by_id('margin_role')[1]

24
lib/awful/widget/calendar_popup.lua
View File

@ -39,14 +39,12 @@ local calendar_popup = { offset = 0, mt = {} }
local properties = { "markup", "fg_color", "bg_color", "shape", "padding", "border_width", "border_color", "opacity" }
local styles = { "year", "month", "yearheader", "monthheader", "header", "weekday", "weeknumber", "normal", "focus" }
--- The generic calendar style table.
--
-- Each table property can also be defined by `beautiful.calendar_[flag]_[property]=val`.
-- @beautiful beautiful.calendar_style
-- @tparam cell_properties table Table of cell style properties
--- Cell properties.
-- @field markup Markup function or format string
-- @field fg_color Text foreground color
@ -69,8 +67,6 @@ local styles = { "year", "month", "yearheader", "monthheader", "header", "weekda
-- @field focus Current day cell properties table
-- @table cell_flags
--- Create a container for the grid layout
-- @tparam table tprops Table of calendar container properties.
-- @treturn function Embedding function widget,flag,date -> widget
@ -98,20 +94,19 @@ local function embed(tprops)
margins = props.padding + props.border_width,
widget = wibox.container.margin
},
shape = props.shape or gears.shape.rectangle,
shape_border_color = props.border_color,
shape_border_width = props.border_width,
fg = props.fg_color,
bg = props.bg_color,
opacity = props.opacity,
widget = wibox.container.background
shape = props.shape or gears.shape.rectangle,
border_color = props.border_color,
border_width = props.border_width,
fg = props.fg_color,
bg = props.bg_color,
opacity = props.opacity,
widget = wibox.container.background
}
return out
end
return fn
end
--- Parse the properties of the cell type and set default values
-- @tparam string cell The cell type
-- @tparam table args Table of properties to enforce
@ -165,7 +160,6 @@ local function parse_all_options(args)
return props
end
--- Make the geometry of a wibox
-- @tparam widget widget Calendar widget
-- @tparam object screen Screen where to display the calendar (default to focused)
@ -236,14 +230,12 @@ function calendar_popup:call_calendar(offset, position, screen)
return self
end
--- Toggle calendar visibility
function calendar_popup:toggle()
self:call_calendar(0)
self.visible = not self.visible
end
--- Attach the calendar to a widget to display at a specific position.
--
-- local mytextclock = wibox.widget.textclock()
@ -286,7 +278,6 @@ function calendar_popup:attach(widget, position, args)
return self
end
--- Return a new calendar wibox by type.
--
-- A calendar widget displaying a `month` or a `year`
@ -385,7 +376,6 @@ function calendar_popup.month(args)
return get_cal_wibox("month", args)
end
--- A year calendar wibox.
--
-- It is highly customizable using the same options as for the widgets.

6
lib/awful/widget/common.lua
View File

@ -148,9 +148,9 @@ function common.list_update(w, buttons, label, data, objects, args)
})
end
cache.bgb.shape = item_args.shape
cache.bgb.shape_border_width = item_args.shape_border_width
cache.bgb.shape_border_color = item_args.shape_border_color
cache.bgb.shape = item_args.shape
cache.bgb.border_width = item_args.shape_border_width
cache.bgb.border_color = item_args.shape_border_color
end

4
tests/examples/awful/popup/wiboxtypes.lua
View File

@ -198,8 +198,8 @@ local function create_info(text, x, y, width, height)
forced_width = width,
forced_height = height,
shape = gears.shape.rectangle,
shape_border_width = 1,
shape_border_color = beautiful.border_color,
border_width = 1,
border_color = beautiful.border_color,
bg = "#ffff0055",
widget = wibox.container.background
}, {x = x, y = y})

12
tests/examples/awful/template.lua
View File

@ -141,12 +141,12 @@ local function client_widget(c, col, label)
},
layout = wibox.layout.stack
},
shape_border_width = bw,
shape_border_color = beautiful.border_color,
shape_clip = true,
fg = beautiful.fg_normal or "#000000",
bg = col,
shape = function(cr2, w, h)
border_width = bw,
border_color = beautiful.border_color,
shape_clip = true,
fg = beautiful.fg_normal or "#000000",
bg = col,
shape = function(cr2, w, h)
return shape.rounded_rect(cr2, w, h, args.radius or 5)
end,

6
tests/examples/wibox/awidget/tasklist/rounded.lua
View File

@ -26,9 +26,9 @@ end --DOC_HIDE
filter = awful.widget.tasklist.filter.currenttags,
buttons = tasklist_buttons,
style = {
shape_border_width = 1,
shape_border_color = "#777777",
shape = gears.shape.rounded_bar,
border_width = 1,
border_color = "#777777",
shape = gears.shape.rounded_bar,
},
layout = {
spacing = 10,

10
tests/examples/wibox/container/background/shape.lua
View File

@ -30,11 +30,11 @@ parent : setup {
bottom = 3,
widget = wibox.container.margin
},
shape = gears.shape.hexagon,
bg = beautiful.bg_normal,
shape_border_color = beautiful.border_color,
shape_border_width = beautiful.border_width,
widget = wibox.container.background
shape = gears.shape.hexagon,
bg = beautiful.bg_normal,
border_color = beautiful.border_color,
border_width = beautiful.border_width,
widget = wibox.container.background
},
spacing = 10,
layout = wibox.layout.fixed.vertical

10
tests/examples/wibox/container/defaults/background.lua
View File

@ -17,11 +17,11 @@ return {
valign = "center",
widget = wibox.widget.textbox,
},
shape = gears.shape.circle,
shape_border_width = 5,
shape_border_color = "#ff0000",
bg = beautiful.bg_highlight,
widget = wibox.container.background
shape = gears.shape.circle,
border_width = 5,
border_color = "#ff0000",
bg = beautiful.bg_highlight,
widget = wibox.container.background
}
--DOC_HIDE vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

26
tests/examples/wibox/container/defaults/template.lua
View File

@ -13,10 +13,10 @@ local container = wibox.widget {
{
{
before,
shape_border_color = beautiful.border_color,
shape_border_width = beautiful.border_width,
shape = shape.rounded_rect,
widget = wibox.container.background,
border_color = beautiful.border_color,
border_width = beautiful.border_width,
shape = shape.rounded_rect,
widget = wibox.container.background,
},
strategy = 'exact',
width = 70,
@ -29,11 +29,11 @@ local container = wibox.widget {
text = " ",
widget = wibox.widget.textbox,
},
bg = beautiful.bg_normal,
shape_border_color = beautiful.border_color,
shape_border_width = beautiful.border_width,
widget = wibox.container.background,
shape = shape.transform(shape.arrow)
bg = beautiful.bg_normal,
border_color = beautiful.border_color,
border_width = beautiful.border_width,
widget = wibox.container.background,
shape = shape.transform(shape.arrow)
: rotate_at(15,15,math.pi/2)
: translate(0,-8)
: scale(0.9, 0.9),
@ -46,10 +46,10 @@ local container = wibox.widget {
{
{
after,
shape_border_color = beautiful.border_color,
shape_border_width = beautiful.border_width,
shape = shape.rounded_rect,
widget = wibox.container.background,
border_color = beautiful.border_color,
border_width = beautiful.border_width,
shape = shape.rounded_rect,
widget = wibox.container.background,
},
strategy = 'exact',
width = 70,

42
tests/examples/wibox/container/rotate/angle.lua
View File

@ -4,27 +4,27 @@ local wibox = require("wibox") --DOC_HIDE
local gears = {shape = require("gears.shape")} --DOC_HIDE
local beautiful = require("beautiful") --DOC_HIDE
local function create_arrow(text) --DOC_HIDE
return { --DOC_HIDE
{ --DOC_HIDE
{ --DOC_HIDE
text = text, --DOC_HIDE
align = "center", --DOC_HIDE
valign = "center", --DOC_HIDE
widget = wibox.widget.textbox, --DOC_HIDE
}, --DOC_HIDE
shape = gears.shape.arrow, --DOC_HIDE
bg = beautiful.bg_normal, --DOC_HIDE
shape_border_color = beautiful.border_color, --DOC_HIDE
shape_border_width = beautiful.border_width, --DOC_HIDE
widget = wibox.container.background --DOC_HIDE
}, --DOC_HIDE
strategy = 'exact', --DOC_HIDE
width = 70, --DOC_HIDE
height = 70, --DOC_HIDE
widget = wibox.container.constraint --DOC_HIDE
} --DOC_HIDE
end --DOC_HIDE
local function create_arrow(text) --DOC_HIDE
return { --DOC_HIDE
{ --DOC_HIDE
{ --DOC_HIDE
text = text, --DOC_HIDE
align = "center", --DOC_HIDE
valign = "center", --DOC_HIDE
widget = wibox.widget.textbox, --DOC_HIDE
}, --DOC_HIDE
shape = gears.shape.arrow, --DOC_HIDE
bg = beautiful.bg_normal, --DOC_HIDE
border_color = beautiful.border_color, --DOC_HIDE
border_width = beautiful.border_width, --DOC_HIDE
widget = wibox.container.background --DOC_HIDE
}, --DOC_HIDE
strategy = 'exact', --DOC_HIDE
width = 70, --DOC_HIDE
height = 70, --DOC_HIDE
widget = wibox.container.constraint --DOC_HIDE
} --DOC_HIDE
end --DOC_HIDE
local normal = create_arrow("Normal")

12
tests/examples/wibox/widget/calendar/fn_embed_cell.lua
View File

@ -67,12 +67,12 @@ beautiful.bg_focus = "#b9214f" --DOC_HIDE
margins = (props.padding or 2) + (props.border_width or 0),
widget = wibox.container.margin
},
shape = props.shape,
shape_border_color = props.border_color or "#b9214f",
shape_border_width = props.border_width or 0,
fg = props.fg_color or "#999999",
bg = props.bg_color or default_bg,
widget = wibox.container.background
shape = props.shape,
border_color = props.border_color or "#b9214f",
border_width = props.border_width or 0,
fg = props.fg_color or "#999999",
bg = props.bg_color or default_bg,
widget = wibox.container.background
}
return ret
end