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

awful.tooltip: Work with all gears.colors as foreground 

This fixes awful.tooltip so that colors other than "#123456" can be used.

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2014-03-16 13:25:01 +01:00
parent c816ad7b63
commit 5b4666432f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/awful/tooltip.lua.in
View File

@ -11,6 +11,7 @@ local wibox = require("wibox")
local a_placement = require("awful.placement") local a_placement = require("awful.placement")
local beautiful = require("beautiful") local beautiful = require("beautiful")
local textbox = require("wibox.widget.textbox") local textbox = require("wibox.widget.textbox")
local background = require("wibox.widget.background")
local setmetatable = setmetatable local setmetatable = setmetatable
local ipairs = ipairs local ipairs = ipairs
@ -78,7 +79,7 @@ end
local function set_geometry(self) local function set_geometry(self)
local my_geo = self.wibox:geometry() local my_geo = self.wibox:geometry()
-- calculate width / height -- calculate width / height
local n_w, n_h = self.widget:fit(-1, -1) local n_w, n_h = self.textbox:fit(-1, -1)
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
self.wibox:geometry({ width = n_w, height = n_h }) self.wibox:geometry({ width = n_w, height = n_h })
end end
@ -119,9 +120,8 @@ end
-- @param self The tooltip object. -- @param self The tooltip object.
-- @param text New tooltip text. -- @param text New tooltip text.
local function set_text(self, text) local function set_text(self, text)
self.widget:set_font(data[self].font) self.textbox:set_font(data[self].font)
self.widget:set_markup('<span color="' .. data[self].fg self.textbox:set_text(text)
.. '">' .. text .. "</span>")
set_geometry(self) set_geometry(self)
end end
@ -178,8 +178,6 @@ local function new(args)
visible = false, visible = false,
} }
local my_textbox = textbox()
-- private data -- private data
data[self] = { data[self] = {
show = function() show(self) end, show = function() show(self) end,
@ -207,8 +205,10 @@ local function new(args)
self.wibox.visible = false self.wibox.visible = false
-- Who wants a non ontop tooltip ? -- Who wants a non ontop tooltip ?
self.wibox.ontop = true self.wibox.ontop = true
self.wibox:set_widget(my_textbox) self.textbox = textbox()
self.widget = my_textbox self.background = background(self.textbox)
self.background:set_fg(data[self].fg)
self.wibox:set_widget(self.background)
-- add some signals on both the tooltip and widget -- add some signals on both the tooltip and widget
self.wibox:connect_signal("mouse::enter", data[self].hide) self.wibox:connect_signal("mouse::enter", data[self].hide)