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

capi.screen[scr]:tags() doesn't exist anymore 

awful.tag.gettags(scr) does now the job

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
dodo 2012-10-25 18:41:00 +02:00 committed by Uli Schlachter
parent 1e4c14d306
commit 57746d7a62
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/awful/tag.lua.in
View File

@ -38,7 +38,7 @@ tag.history.limit = 20
function tag.move(new_index, target_tag) function tag.move(new_index, target_tag)
local target_tag = target_tag or tag.selected() local target_tag = target_tag or tag.selected()
local scr = tag.getscreen(target_tag) local scr = tag.getscreen(target_tag)
local tmp_tags = capi.screen[scr]:tags() local tmp_tags = tag.gettags(scr)
if (not new_index) or (new_index < 1) or (new_index > #tmp_tags) then if (not new_index) or (new_index < 1) or (new_index > #tmp_tags) then
return return
@ -52,7 +52,10 @@ function tag.move(new_index, target_tag)
end end
table.insert(tmp_tags, new_index, target_tag) table.insert(tmp_tags, new_index, target_tag)
capi.screen[scr]:tags(tmp_tags)
for _, tmp_tag in ipairs(tmp_tags) do
tag.setscreen(tmp_tag, scr)
end
end end
--- Add a tag. --- Add a tag.
@ -99,7 +102,7 @@ function tag.find_fallback(screen, invalids)
local scr = screen or capi.mouse.screen local scr = screen or capi.mouse.screen
local t = invalids or tag.selectedlist(scr) local t = invalids or tag.selectedlist(scr)
for _, v in pairs(capi.screen[scr]:tags()) do for _, v in pairs(tag.gettags(scr)) do
if not util.table.hasitem(t, v) then return v end if not util.table.hasitem(t, v) then return v end
end end
end end
@ -118,7 +121,7 @@ function tag.delete(target_tag, fallback_tag)
if target_tag == nil then return end if target_tag == nil then return end
local target_scr = tag.getscreen(target_tag) local target_scr = tag.getscreen(target_tag)
local ntags = #capi.screen[target_scr]:tags() local ntags = #tag.gettags(target_scr)
-- We can't use the target tag as a fallback. -- We can't use the target tag as a fallback.
local fallback_tag = fallback_tag local fallback_tag = fallback_tag
@ -153,7 +156,7 @@ function tag.delete(target_tag, fallback_tag)
if tag.selected(target_scr) == nil and ntags > 0 then if tag.selected(target_scr) == nil and ntags > 0 then
tag.history.restore() tag.history.restore()
if tag.selected(target_scr) == nil then if tag.selected(target_scr) == nil then
capi.screen[target_scr]:tags()[1].selected = true tag.gettags(target_scr)[1].selected = true
end end
end end