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

naughty: Correctly update the content of the legacy popup

This commit is contained in:
Emmanuel Lepage Vallee 2019-02-09 17:14:38 -05:00
parent d859f671a1
commit 7c96a98a0d
1 changed files with 46 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
lib/naughty/layout/legacy.lua
View File

@ -374,6 +374,10 @@ function naughty.default_notification_handler(notification, args)
notification.textbox = textbox notification.textbox = textbox
set_escaped_text(notification) set_escaped_text(notification)
-- Update the content if it changes
notification:connect_signal("property::message", set_escaped_text)
notification:connect_signal("property::title" , set_escaped_text)
local actionslayout = wibox.layout.fixed.vertical() local actionslayout = wibox.layout.fixed.vertical()
local actions_max_width = 0 local actions_max_width = 0
local actions_total_height = 0 local actions_total_height = 0
@ -435,47 +439,58 @@ function naughty.default_notification_handler(notification, args)
-- is the icon file readable? -- is the icon file readable?
local had_icon = type(icon) == "string" local had_icon = type(icon) == "string"
icon = surface.load_uncached_silently(icon) icon = surface.load_uncached_silently(icon)
-- if we have an icon, use it
if icon then if icon then
iconbox = wibox.widget.imagebox() iconbox = wibox.widget.imagebox()
iconmargin = wibox.container.margin(iconbox, margin, margin, margin, margin) iconmargin = wibox.container.margin(iconbox, margin, margin, margin, margin)
end
if max_height and icon:get_height() > max_height then -- if we have an icon, use it
icon_size = icon_size and math.min(max_height, icon_size) or max_height local function update_icon(icn)
if icn then
if max_height and icn:get_height() > max_height then
icon_size = icon_size and math.min(max_height, icon_size) or max_height
end
if max_width and icn:get_width() > max_width then
icon_size = icon_size and math.min(max_width, icon_size) or max_width
end
if icon_size and (icn:get_height() > icon_size or icn:get_width() > icon_size) then
size_info.icon_scale_factor = icon_size / math.max(icn:get_height(),
icn:get_width())
size_info.icon_w = icn:get_width () * size_info.icon_scale_factor
size_info.icon_h = icn:get_height() * size_info.icon_scale_factor
local scaled =
cairo.ImageSurface(cairo.Format.ARGB32,
gmath.round(size_info.icon_w),
gmath.round(size_info.icon_h))
local cr = cairo.Context(scaled)
cr:scale(size_info.icon_scale_factor, size_info.icon_scale_factor)
cr:set_source_surface(icn, 0, 0)
cr:paint()
icn = scaled
else
size_info.icon_w = icn:get_width ()
size_info.icon_h = icn:get_height()
end
iconbox:set_resize(false)
iconbox:set_image(icn)
end end
end
if max_width and icon:get_width() > max_width then if icon then
icon_size = icon_size and math.min(max_width, icon_size) or max_width notification:connect_signal("property::icon", function()
end update_icon(surface.load_uncached_silently(notification.icon))
end)
if icon_size and (icon:get_height() > icon_size or icon:get_width() > icon_size) then update_icon(icon)
size_info.icon_scale_factor = icon_size / math.max(icon:get_height(),
icon:get_width())
size_info.icon_w = icon:get_width () * size_info.icon_scale_factor
size_info.icon_h = icon:get_height() * size_info.icon_scale_factor
local scaled =
cairo.ImageSurface(cairo.Format.ARGB32,
gmath.round(size_info.icon_w),
gmath.round(size_info.icon_h))
local cr = cairo.Context(scaled)
cr:scale(size_info.icon_scale_factor, size_info.icon_scale_factor)
cr:set_source_surface(icon, 0, 0)
cr:paint()
icon = scaled
else
size_info.icon_w = icon:get_width ()
size_info.icon_h = icon:get_height()
end
iconbox:set_resize(false)
iconbox:set_image(icon)
elseif had_icon then elseif had_icon then
require("gears.debug").print_warning("Naughty: failed to load icon ".. require("gears.debug").print_warning("Naughty: failed to load icon "..
(args.icon or preset.icon).. "(title: "..title..")") (args.icon or preset.icon).. "(title: "..title..")")
end end
end end
notification.iconbox = iconbox notification.iconbox = iconbox