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

Remove hacks for querying a textbox' size 

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2015-10-17 18:44:07 +02:00
parent cdd8d2ed5f
commit fcfed22d8a
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/awful/tooltip.lua
View File

@ -71,9 +71,8 @@ end
-- @tparam tooltip self A tooltip object. -- @tparam tooltip self A tooltip object.
local function set_geometry(self) local function set_geometry(self)
local my_geo = self.wibox:geometry() local my_geo = self.wibox:geometry()
local textbox_context = {dpi=beautiful.xresources.get_dpi(mouse.screen)}
-- calculate width / height -- calculate width / height
local n_w, n_h = self.textbox:fit(textbox_context, -1, -1) -- Hack! :( local n_w, n_h = self.textbox:get_preferred_size(mouse.screen)
n_w = n_w + self.marginbox.left + self.marginbox.right n_w = n_w + self.marginbox.left + self.marginbox.right
n_h = n_h + self.marginbox.top + self.marginbox.bottom n_h = n_h + self.marginbox.top + self.marginbox.bottom
if my_geo.width ~= n_w or my_geo.height ~= n_h then if my_geo.width ~= n_w or my_geo.height ~= n_h then

8
lib/naughty/core.lua
View File

@ -458,8 +458,6 @@ function naughty.notify(args)
local border_color = args.border_color or preset.border_color or beautiful.bg_focus or '#535d6c' local border_color = args.border_color or preset.border_color or beautiful.bg_focus or '#535d6c'
local notification = { screen = screen, destroy_cb = destroy_cb, timeout = timeout } local notification = { screen = screen, destroy_cb = destroy_cb, timeout = timeout }
local textbox_context = {dpi=bt.xresources.get_dpi(s)}
-- replace notification if needed -- replace notification if needed
if args.replaces_id then if args.replaces_id then
local obj = naughty.getById(args.replaces_id) local obj = naughty.getById(args.replaces_id)
@ -532,7 +530,7 @@ function naughty.notify(args)
actiontextbox:set_font(font) actiontextbox:set_font(font)
actiontextbox:set_markup(string.format('<b>%s</b>', action)) actiontextbox:set_markup(string.format('<b>%s</b>', action))
-- calculate the height and width -- calculate the height and width
local w, h = actiontextbox:fit(textbox_context, -1, -1) -- Hack! :( local w, h = actiontextbox:get_preferred_size(s)
local height = h + 2 * margin local height = h + 2 * margin
local width = w + 2 * margin local width = w + 2 * margin
@ -602,7 +600,7 @@ function naughty.notify(args)
-- calculate the height -- calculate the height
if not height then if not height then
local w, h = textbox:fit(textbox_context, -1, -1) -- Hack! :-( local w, h = textbox:get_preferred_size(s)
if iconbox and icon_h + 2 * margin > h + 2 * margin then if iconbox and icon_h + 2 * margin > h + 2 * margin then
height = icon_h + 2 * margin height = icon_h + 2 * margin
else else
@ -614,7 +612,7 @@ function naughty.notify(args)
-- calculate the width -- calculate the width
if not width then if not width then
local w, h = textbox:fit(textbox_context, -1, -1) -- Hack! :-( local w, h = textbox:get_preferred_size(s)
width = w + (iconbox and icon_w + 2 * margin or 0) + 2 * margin width = w + (iconbox and icon_w + 2 * margin or 0) + 2 * margin
end end