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

Merge pull request #1854 from Elv13/fix_1849 

notification: Fix `font` and use `beautiful` directly
This commit is contained in:
Emmanuel Lepage Vallée 2017-06-20 05:19:52 -04:00 committed by GitHub
parent 8c926027c4 0829cc2d76
commit 983fd4710f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/naughty/core.lua
View File

@ -22,11 +22,11 @@ local screen = require("awful.screen")
local util = require("awful.util")
local gtable = require("gears.table")
local gfs = require("gears.filesystem")
local bt = require("beautiful")
local beautiful = require("beautiful")
local wibox = require("wibox")
local surface = require("gears.surface")
local cairo = require("lgi").cairo
local dpi = bt.xresources.apply_dpi
local dpi = beautiful.xresources.apply_dpi
local function get_screen(s)
return s and capi.screen[s]
@ -591,8 +591,7 @@ function naughty.notify(args)
local destroy_cb = args.destroy
-- beautiful
local beautiful = bt.get()
local font = args.font or preset.font or
local font = args.font or preset.font or beautiful.notification_font or
beautiful.font or capi.awesome.font
local fg = args.fg or preset.fg or
beautiful.notification_fg or beautiful.fg_normal or '#ffffff'