don't override theme.wallpaper; closes #172

This commit is contained in:
Luke Bonham 2017-03-17 17:23:34 +01:00
parent 5f58dfa52d
commit c7ffacb512
10 changed files with 40 additions and 30 deletions

View File

@ -209,10 +209,11 @@ function theme.at_screen_connect(s)
s.quake = lain.util.quake({ app = awful.util.terminal }) s.quake = lain.util.quake({ app = awful.util.terminal })
-- If wallpaper is a function, call it with the screen -- If wallpaper is a function, call it with the screen
if type(theme.wallpaper) == "function" then local wallpaper = theme.wallpaper
theme.wallpaper = theme.wallpaper(s) if type(wallpaper) == "function" then
wallpaper = wallpaper(s)
end end
gears.wallpaper.maximized(theme.wallpaper, s, true) gears.wallpaper.maximized(wallpaper, s, true)
-- Tags -- Tags
awful.tag(awful.util.tagnames, s, awful.layout.layouts) awful.tag(awful.util.tagnames, s, awful.layout.layouts)

View File

@ -293,10 +293,11 @@ function theme.at_screen_connect(s)
s.quake = lain.util.quake({ app = awful.util.terminal }) s.quake = lain.util.quake({ app = awful.util.terminal })
-- If wallpaper is a function, call it with the screen -- If wallpaper is a function, call it with the screen
if type(theme.wallpaper) == "function" then local wallpaper = theme.wallpaper
theme.wallpaper = theme.wallpaper(s) if type(wallpaper) == "function" then
wallpaper = wallpaper(s)
end end
gears.wallpaper.maximized(theme.wallpaper, s, true) gears.wallpaper.maximized(wallpaper, s, true)
-- Tags -- Tags
awful.tag(awful.util.tagnames, s, awful.layout.layouts) awful.tag(awful.util.tagnames, s, awful.layout.layouts)

View File

@ -191,10 +191,11 @@ function theme.at_screen_connect(s)
s.quake = lain.util.quake({ app = awful.util.terminal }) s.quake = lain.util.quake({ app = awful.util.terminal })
-- If wallpaper is a function, call it with the screen -- If wallpaper is a function, call it with the screen
if type(theme.wallpaper) == "function" then local wallpaper = theme.wallpaper
theme.wallpaper = theme.wallpaper(s) if type(wallpaper) == "function" then
wallpaper = wallpaper(s)
end end
gears.wallpaper.maximized(theme.wallpaper, s, true) gears.wallpaper.maximized(wallpaper, s, true)
-- Tags -- Tags
awful.tag(awful.util.tagnames, s, awful.layout.layouts) awful.tag(awful.util.tagnames, s, awful.layout.layouts)

View File

@ -290,10 +290,11 @@ function theme.at_screen_connect(s)
s.quake = lain.util.quake({ app = awful.util.terminal }) s.quake = lain.util.quake({ app = awful.util.terminal })
-- If wallpaper is a function, call it with the screen -- If wallpaper is a function, call it with the screen
if type(theme.wallpaper) == "function" then local wallpaper = theme.wallpaper
theme.wallpaper = theme.wallpaper(s) if type(wallpaper) == "function" then
wallpaper = wallpaper(s)
end end
gears.wallpaper.maximized(theme.wallpaper, s, true) gears.wallpaper.maximized(wallpaper, s, true)
-- Tags -- Tags
awful.tag(awful.util.tagnames, s, awful.layout.layouts) awful.tag(awful.util.tagnames, s, awful.layout.layouts)

View File

@ -255,10 +255,11 @@ function theme.at_screen_connect(s)
s.quake = lain.util.quake({ app = awful.util.terminal }) s.quake = lain.util.quake({ app = awful.util.terminal })
-- If wallpaper is a function, call it with the screen -- If wallpaper is a function, call it with the screen
if type(theme.wallpaper) == "function" then local wallpaper = theme.wallpaper
theme.wallpaper = theme.wallpaper(s) if type(wallpaper) == "function" then
wallpaper = wallpaper(s)
end end
gears.wallpaper.maximized(theme.wallpaper, s, true) gears.wallpaper.maximized(wallpaper, s, true)
-- Tags -- Tags
awful.tag(awful.util.tagnames, s, awful.layout.layouts) awful.tag(awful.util.tagnames, s, awful.layout.layouts)

View File

@ -249,10 +249,11 @@ function theme.at_screen_connect(s)
s.quake = lain.util.quake({ app = awful.util.terminal }) s.quake = lain.util.quake({ app = awful.util.terminal })
-- If wallpaper is a function, call it with the screen -- If wallpaper is a function, call it with the screen
if type(theme.wallpaper) == "function" then local wallpaper = theme.wallpaper
theme.wallpaper = theme.wallpaper(s) if type(wallpaper) == "function" then
wallpaper = wallpaper(s)
end end
gears.wallpaper.maximized(theme.wallpaper, s, true) gears.wallpaper.maximized(wallpaper, s, true)
-- Tags -- Tags
awful.tag(awful.util.tagnames, s, awful.layout.layouts) awful.tag(awful.util.tagnames, s, awful.layout.layouts)

View File

@ -286,10 +286,11 @@ function theme.at_screen_connect(s)
s.quake = lain.util.quake({ app = awful.util.terminal }) s.quake = lain.util.quake({ app = awful.util.terminal })
-- If wallpaper is a function, call it with the screen -- If wallpaper is a function, call it with the screen
if type(theme.wallpaper) == "function" then local wallpaper = theme.wallpaper
theme.wallpaper = theme.wallpaper(s) if type(wallpaper) == "function" then
wallpaper = wallpaper(s)
end end
gears.wallpaper.maximized(theme.wallpaper, s, true) gears.wallpaper.maximized(wallpaper, s, true)
-- Tags -- Tags
awful.tag(awful.util.tagnames, s, awful.layout.layouts) awful.tag(awful.util.tagnames, s, awful.layout.layouts)

View File

@ -213,10 +213,11 @@ function theme.at_screen_connect(s)
s.quake = lain.util.quake({ app = awful.util.terminal }) s.quake = lain.util.quake({ app = awful.util.terminal })
-- If wallpaper is a function, call it with the screen -- If wallpaper is a function, call it with the screen
if type(theme.wallpaper) == "function" then local wallpaper = theme.wallpaper
theme.wallpaper = theme.wallpaper(s) if type(wallpaper) == "function" then
wallpaper = wallpaper(s)
end end
gears.wallpaper.maximized(theme.wallpaper, s, true) gears.wallpaper.maximized(wallpaper, s, true)
-- Tags -- Tags
awful.tag(awful.util.tagnames, s, awful.layout.layouts) awful.tag(awful.util.tagnames, s, awful.layout.layouts)

View File

@ -207,10 +207,11 @@ function theme.at_screen_connect(s)
s.quake = lain.util.quake({ app = awful.util.terminal }) s.quake = lain.util.quake({ app = awful.util.terminal })
-- If wallpaper is a function, call it with the screen -- If wallpaper is a function, call it with the screen
if type(theme.wallpaper) == "function" then local wallpaper = theme.wallpaper
theme.wallpaper = theme.wallpaper(s) if type(wallpaper) == "function" then
wallpaper = wallpaper(s)
end end
gears.wallpaper.maximized(theme.wallpaper, s, true) gears.wallpaper.maximized(wallpaper, s, true)
-- Tags -- Tags
awful.tag(awful.util.tagnames, s, awful.layout.layouts) awful.tag(awful.util.tagnames, s, awful.layout.layouts)

View File

@ -387,10 +387,11 @@ function theme.at_screen_connect(s)
s.quake = lain.util.quake({ app = awful.util.terminal, border = theme.border_width }) s.quake = lain.util.quake({ app = awful.util.terminal, border = theme.border_width })
-- If wallpaper is a function, call it with the screen -- If wallpaper is a function, call it with the screen
if type(theme.wallpaper) == "function" then local wallpaper = theme.wallpaper
theme.wallpaper = theme.wallpaper(s) if type(wallpaper) == "function" then
wallpaper = wallpaper(s)
end end
gears.wallpaper.maximized(theme.wallpaper, s, true) gears.wallpaper.maximized(wallpaper, s, true)
-- Tags -- Tags
awful.tag(awful.util.tagnames, s, awful.layout.layouts) awful.tag(awful.util.tagnames, s, awful.layout.layouts)