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

beautiful: Don't use a PangoLayout for getting font height 

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2014-03-23 18:57:48 +01:00
parent de46670c8c
commit dd31b42ada
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/beautiful.lua.in
View File

@ -41,14 +41,18 @@ local function load_font(name)
if fonts[name] then if fonts[name] then
return fonts[name] return fonts[name]
end end
-- load new font
-- Load new font
local desc = Pango.FontDescription.from_string(name) local desc = Pango.FontDescription.from_string(name)
local ctx = PangoCairo.font_map_get_default():create_context() local ctx = PangoCairo.font_map_get_default():create_context()
local layout = Pango.Layout.new(ctx)
layout:set_font_description(desc)
local width, height = layout:get_pixel_size() -- Apply default values from the context (e.g. a default font size)
desc:merge(ctx:get_font_description(), false)
-- Calculate fond height
local metrics = ctx:get_metrics(desc, nil)
local height = math.ceil((metrics:get_ascent() + metrics:get_descent()) / Pango.SCALE)
local font = { name = name, description = desc, height = height } local font = { name = name, description = desc, height = height }
fonts[name] = font fonts[name] = font
descs[desc] = name descs[desc] = name