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

gears.wallpaper: Use root.size() 

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2016-04-09 15:19:46 +02:00
parent fe11c5abbf
commit 7863a5e65b
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/gears/wallpaper.lua
View File

@ -9,18 +9,14 @@ local cairo = require("lgi").cairo
local color = require("gears.color") local color = require("gears.color")
local surface = require("gears.surface") local surface = require("gears.surface")
local timer = require("gears.timer") local timer = require("gears.timer")
local root = root
local wallpaper = { mt = {} } local wallpaper = { mt = {} }
-- The size of the root window local function root_geometry()
local root_geom = { x = 0, y = 0, width = 0, height = 0 } local width, height = root.size()
return { x = 0, y = 0, width = width, height = height }
-- Gears should not depend on awful or C-API, this should be fixed eventually end
require("awful.screen").connect_for_each_screen(function(s)
local g = s.geometry
root_geom.width = math.max(root_geom.width, g.x + g.width)
root_geom.height = math.max(root_geom.height, g.y + g.height)
end)
-- A cairo surface that we still want to set as the wallpaper -- A cairo surface that we still want to set as the wallpaper
local pending_wallpaper = nil local pending_wallpaper = nil
@ -33,14 +29,14 @@ local pending_wallpaper = nil
-- @return[1] The available geometry (table with entries width and height) -- @return[1] The available geometry (table with entries width and height)
-- @return[1] A cairo context that the wallpaper should be drawn to -- @return[1] A cairo context that the wallpaper should be drawn to
function wallpaper.prepare_context(s) function wallpaper.prepare_context(s)
local geom = s and screen[s].geometry or root_geom local geom = s and screen[s].geometry or root_geometry()
local cr local cr
if not pending_wallpaper then if not pending_wallpaper then
-- Prepare a pending wallpaper -- Prepare a pending wallpaper
local wp = surface(root.wallpaper()) local wp = surface(root.wallpaper())
pending_wallpaper = wp:create_similar(cairo.Content.COLOR, root_geom.width, root_geom.height) pending_wallpaper = wp:create_similar(cairo.Content.COLOR, root.size())
-- Copy the old wallpaper to the new one -- Copy the old wallpaper to the new one
cr = cairo.Context(pending_wallpaper) cr = cairo.Context(pending_wallpaper)