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

awful.tooltip: Small reorganization 

This inlines the set_defaults() function into its only caller and makes us less
stupid with the font property.

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2014-03-30 23:31:38 +02:00
parent d2b1e92f9e
commit 90226d0ccf
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,7 +120,6 @@ 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.textbox:set_font(data[self].font)
self.textbox:set_text(text) self.textbox:set_text(text)
set_geometry(self) set_geometry(self)
end end
@ -134,17 +133,6 @@ local function set_timeout(self, timeout)
end end
end end
-- Load Default values.
-- @param self A tooltip object.
local function set_defaults(self)
self.wibox.border_width = beautiful.tooltip_border_width or beautiful.border_width or 1
self.wibox.border_color = beautiful.tooltip_border_color or beautiful.border_normal or "#ffcb60"
self.wibox.opacity = beautiful.tooltip_opacity or 1
self.wibox:set_bg(beautiful.tooltip_bg_color or beautiful.bg_focus or "#ffcb60")
data[self].fg = beautiful.tooltip_fg_color or beautiful.fg_focus or "#000000"
data[self].font = beautiful.tooltip_font or beautiful.font or "terminus 6"
end
--- Add tooltip to an object. --- Add tooltip to an object.
-- @param self The tooltip. -- @param self The tooltip.
-- @param object An object. -- @param object An object.
@ -190,8 +178,6 @@ local function new(args)
self.add_to_object = add_to_object self.add_to_object = add_to_object
self.remove_from_object = remove_from_object self.remove_from_object = remove_from_object
set_defaults(self)
-- setup the timer action only if needed -- setup the timer action only if needed
if args.timer_function then if args.timer_function then
data[self].timer = timer { timeout = args.timeout and args.timeout or 1 } data[self].timer = timer { timeout = args.timeout and args.timeout or 1 }
@ -201,13 +187,22 @@ local function new(args)
data[self].timer:connect_signal("timeout", data[self].timer_function) data[self].timer:connect_signal("timeout", data[self].timer_function)
end end
-- Set default properties
self.wibox.border_width = beautiful.tooltip_border_width or beautiful.border_width or 1
self.wibox.border_color = beautiful.tooltip_border_color or beautiful.border_normal or "#ffcb60"
self.wibox.opacity = beautiful.tooltip_opacity or 1
self.wibox:set_bg(beautiful.tooltip_bg_color or beautiful.bg_focus or "#ffcb60")
local fg = beautiful.tooltip_fg_color or beautiful.fg_focus or "#000000"
local font = beautiful.tooltip_font or beautiful.font or "terminus 6"
-- set tooltip properties -- set tooltip properties
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.textbox = textbox() self.textbox = textbox()
self.textbox:set_font(font)
self.background = background(self.textbox) self.background = background(self.textbox)
self.background:set_fg(data[self].fg) self.background:set_fg(fg)
self.wibox:set_widget(self.background) self.wibox:set_widget(self.background)
-- add some signals on both the tooltip and widget -- add some signals on both the tooltip and widget