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

Revert "naughty: add notification max width and height (#2232)" 

This reverts commit 5e6f534365.
This commit is contained in:
Emmanuel Lepage Vallee 2019-01-01 16:56:52 -05:00
parent 898db88443
commit 0703156155
1 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/naughty/core.lua
View File

@ -190,14 +190,6 @@ naughty.notificationClosedReason = {
-- @beautiful beautiful.notification_height -- @beautiful beautiful.notification_height
-- @tparam int notification_height -- @tparam int notification_height
--- Notifications maximum width.
-- @beautiful beautiful.notification_max_width
-- @tparam int notification_max_width
--- Notifications maximum height.
-- @beautiful beautiful.notification_max_height
-- @tparam int notification_max_height
--- Notifications icon size. --- Notifications icon size.
-- @beautiful beautiful.notification_icon_size -- @beautiful beautiful.notification_icon_size
-- @tparam int notification_icon_size -- @tparam int notification_icon_size
@ -509,10 +501,6 @@ local function update_size(notification)
width = s.actions_max_width width = s.actions_max_width
end end
if s.max_width then
width = math.min(width, s.max_width)
end
-- calculate the height -- calculate the height
if not height then if not height then
local w = width - (n.iconbox and s.icon_w + 2 * margin or 0) - 2 * margin local w = width - (n.iconbox and s.icon_w + 2 * margin or 0) - 2 * margin
@ -526,10 +514,6 @@ local function update_size(notification)
height = height + s.actions_total_height height = height + s.actions_total_height
if s.max_height then
height = math.min(height, s.max_height)
end
-- crop to workarea size if too big -- crop to workarea size if too big
local workarea = n.screen.workarea local workarea = n.screen.workarea
local border_width = s.border_width or 0 local border_width = s.border_width or 0
@ -586,8 +570,6 @@ end
-- @bool[opt=true] args.ontop Boolean forcing popups to display on top. -- @bool[opt=true] args.ontop Boolean forcing popups to display on top.
-- @int[opt=`beautiful.notification_height` or auto] args.height Popup height. -- @int[opt=`beautiful.notification_height` or auto] args.height Popup height.
-- @int[opt=`beautiful.notification_width` or auto] args.width Popup width. -- @int[opt=`beautiful.notification_width` or auto] args.width Popup width.
-- @int[opt=`beautiful.notification_max_height` or auto] args.max_height Popup maximum height.
-- @int[opt=`beautiful.notification_max_width` or auto] args.max_width Popup maximum width.
-- @string[opt=`beautiful.notification_font` or `beautiful.font` or `awesome.font`] args.font Notification font. -- @string[opt=`beautiful.notification_font` or `beautiful.font` or `awesome.font`] args.font Notification font.
-- @string[opt] args.icon Path to icon. -- @string[opt] args.icon Path to icon.
-- @int[opt] args.icon_size Desired icon size in px. -- @int[opt] args.icon_size Desired icon size in px.
@ -663,10 +645,6 @@ function naughty.notify(args)
beautiful.notification_width beautiful.notification_width
local height = args.height or preset.height or local height = args.height or preset.height or
beautiful.notification_height beautiful.notification_height
local max_width = args.max_width or preset.max_width or
beautiful.notification_max_width
local max_height = args.max_height or preset.max_height or
beautiful.notification_max_height
local margin = args.margin or preset.margin or local margin = args.margin or preset.margin or
beautiful.notification_margin beautiful.notification_margin
local opacity = args.opacity or preset.opacity or local opacity = args.opacity or preset.opacity or
@ -827,8 +805,6 @@ function naughty.notify(args)
notification.size_info = { notification.size_info = {
width = width, width = width,
height = height, height = height,
max_width = max_width,
max_height = max_height,
icon_w = icon_w, icon_w = icon_w,
icon_h = icon_h, icon_h = icon_h,
margin = margin, margin = margin,