Merge remote-tracking branch 'blueyed/client-set-screen-with-tags'

This commit is contained in:
Uli Schlachter 2014-03-24 22:18:27 +01:00
commit 6116c90210
2 changed files with 3 additions and 1 deletions

View File

@ -9,6 +9,7 @@ local client = client
local screen = screen local screen = screen
local ipairs = ipairs local ipairs = ipairs
local math = math local math = math
local atag = require("awful.tag")
--- Implements EWMH requests handling. --- Implements EWMH requests handling.
-- awful.ewmh -- awful.ewmh
@ -147,6 +148,7 @@ function ewmh.tag(c, t)
if not t then if not t then
c.sticky = true c.sticky = true
else else
c.screen = atag.getscreen(t)
c:tags({ t }) c:tags({ t })
end end
end end

View File

@ -206,8 +206,8 @@ function rules.execute(c, props, callbacks)
if property == "floating" then if property == "floating" then
aclient.floating.set(c, value) aclient.floating.set(c, value)
elseif property == "tag" then elseif property == "tag" then
c:tags({ value })
c.screen = atag.getscreen(value) c.screen = atag.getscreen(value)
c:tags({ value })
elseif property == "switchtotag" and value and props.tag then elseif property == "switchtotag" and value and props.tag then
atag.viewonly(props.tag) atag.viewonly(props.tag)
elseif property == "height" or property == "width" or elseif property == "height" or property == "width" or