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

Fix minor issues with calendar_popup (#2269)

This commit is contained in:
Kevin Zander 2018-05-28 19:54:58 -05:00 committed by Emmanuel Lepage Vallée
parent 6615931a6e
commit 05b8836b01
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,10 +123,7 @@ local function parse_cell_options(cell, args)
for _, prop in ipairs(properties) do for _, prop in ipairs(properties) do
local default local default
if prop == 'markup' then if prop == 'fg_color' then
default = cell == "focus" and string.format('<span foreground="%s" background="%s"><b>%s</b></span>',
beautiful.fg_focus, beautiful.bg_focus, "%s")
elseif prop == 'fg_color' then
default = cell == "focus" and beautiful.fg_focus or beautiful.fg_normal default = cell == "focus" and beautiful.fg_focus or beautiful.fg_normal
elseif prop == 'bg_color' then elseif prop == 'bg_color' then
default = cell == "focus" and beautiful.bg_focus or beautiful.bg_normal default = cell == "focus" and beautiful.bg_focus or beautiful.bg_normal
@ -145,6 +142,11 @@ local function parse_cell_options(cell, args)
-- Get default -- Get default
props[prop] = args[prop] or beautiful["calendar_" .. cell .. "_" .. prop] or bl_style[prop] or default props[prop] = args[prop] or beautiful["calendar_" .. cell .. "_" .. prop] or bl_style[prop] or default
end end
props['markup'] = cell == "focus" and
(args['markup'] or beautiful["calendar_" .. cell .. "_markup"] or bl_style['markup'] or
string.format('<span foreground="%s" background="%s"><b>%s</b></span>',
props['fg_color'], props['bg_color'], "%s")
)
return props return props
end end
@ -170,7 +172,8 @@ end
-- @tparam string position Two characters position of the calendar (default "cc") -- @tparam string position Two characters position of the calendar (default "cc")
-- @treturn number,number,number,number Geometry of the calendar, list of x, y, width, height -- @treturn number,number,number,number Geometry of the calendar, list of x, y, width, height
local function get_geometry(widget, screen, position) local function get_geometry(widget, screen, position)
local pos, s = position or "cc", screen or ascreen.focused() local pos = position or "cc"
local s = screen or ascreen.focused()
local margin = widget._calendar_margin or 0 local margin = widget._calendar_margin or 0
local wa = s.workarea local wa = s.workarea
local width, height = widget:fit({screen=s, dpi=s.dpi}, wa.width, wa.height) local width, height = widget:fit({screen=s, dpi=s.dpi}, wa.width, wa.height)
@ -207,7 +210,9 @@ end
-- @tparam screen screen Screen where to display the calendar -- @tparam screen screen Screen where to display the calendar
-- @treturn wibox The wibox calendar -- @treturn wibox The wibox calendar
function calendar_popup:call_calendar(offset, position, screen) function calendar_popup:call_calendar(offset, position, screen)
local inc_offset, pos, s = offset or 0, position or self.position, screen or self.screen or ascreen.focused() local inc_offset = offset or 0
local pos = position or self.position
local s = screen or self.screen or ascreen.focused()
self.position = pos -- remember last position when changing offset self.position = pos -- remember last position when changing offset
self.offset = inc_offset ~= 0 and self.offset + inc_offset or 0 self.offset = inc_offset ~= 0 and self.offset + inc_offset or 0
@ -311,7 +316,7 @@ local function get_cal_wibox(caltype, args)
local ret = wibox{ ontop = true, local ret = wibox{ ontop = true,
opacity = args.opacity or 1, opacity = args.opacity or 1,
bg = args.bg bg = args.bg or gears.color.transparent
} }
gears.table.crush(ret, calendar_popup, false) gears.table.crush(ret, calendar_popup, false)
@ -320,7 +325,7 @@ local function get_cal_wibox(caltype, args)
ret.screen = args.screen ret.screen = args.screen
local widget = wibox.widget { local widget = wibox.widget {
font = args.font, font = args.font or beautiful.font,
spacing = args.spacing, spacing = args.spacing,
week_numbers = args.week_numbers, week_numbers = args.week_numbers,
start_sunday = args.start_sunday, start_sunday = args.start_sunday,