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

notification: Fix `font` and use `beautiful` directly 

Using `beautiful.get()` has the drawback of not supporting theme
variables set from `rc.lua`. It is also used less often than
direct theme access, making it a bit inconsistent with how other
modules behave.
This commit is contained in:
Emmanuel Lepage Vallee 2017-06-19 19:45:38 -04:00
parent f8a9b9891d
commit 0829cc2d76
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 util = require("awful.util")
local gtable = require("gears.table") local gtable = require("gears.table")
local gfs = require("gears.filesystem") local gfs = require("gears.filesystem")
local bt = require("beautiful") local beautiful = require("beautiful")
local wibox = require("wibox") local wibox = require("wibox")
local surface = require("gears.surface") local surface = require("gears.surface")
local cairo = require("lgi").cairo local cairo = require("lgi").cairo
local dpi = bt.xresources.apply_dpi local dpi = beautiful.xresources.apply_dpi
local function get_screen(s) local function get_screen(s)
return s and capi.screen[s] return s and capi.screen[s]
@ -591,8 +591,7 @@ function naughty.notify(args)
local destroy_cb = args.destroy local destroy_cb = args.destroy
-- beautiful -- beautiful
local beautiful = bt.get() local font = args.font or preset.font or beautiful.notification_font or
local font = args.font or preset.font or
beautiful.font or capi.awesome.font beautiful.font or capi.awesome.font
local fg = args.fg or preset.fg or local fg = args.fg or preset.fg or
beautiful.notification_fg or beautiful.fg_normal or '#ffffff' beautiful.notification_fg or beautiful.fg_normal or '#ffffff'