awful.layout.suit.vile: rename to tile

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2009-01-28 12:08:33 +01:00
parent ed2581c3ec
commit cc6dee9940
19 changed files with 35 additions and 35 deletions

View File

@ -30,10 +30,10 @@ modkey = "Mod4"
-- Table of layouts to cover with awful.layout.inc, order matters.
layouts =
{
awful.layout.suit.vile,
awful.layout.suit.vile.left,
awful.layout.suit.vile.bottom,
awful.layout.suit.vile.top,
awful.layout.suit.tile,
awful.layout.suit.tile.left,
awful.layout.suit.tile.bottom,
awful.layout.suit.tile.top,
awful.layout.suit.fair,
awful.layout.suit.fair.horizontal,
awful.layout.suit.max,

View File

@ -64,10 +64,10 @@ end
local layouts_name =
{
[suit.vile] = "vile",
[suit.vile.left] = "vileleft",
[suit.vile.bottom] = "vilebottom",
[suit.vile.top] = "viletop",
[suit.tile] = "tile",
[suit.tile.left] = "tileleft",
[suit.tile.bottom] = "tilebottom",
[suit.tile.top] = "tiletop",
[suit.fair] = "fairv",
[suit.fair.horizontal] = "fairh",
[suit.max] = "max",

View File

@ -1,5 +1,5 @@
require("awful.layout.suit.max")
require("awful.layout.suit.vile")
require("awful.layout.suit.tile")
require("awful.layout.suit.fair")
require("awful.layout.suit.floating")
require("awful.layout.suit.magnifier")

View File

@ -18,7 +18,7 @@ local capi =
}
--- Tiled layouts module for awful
module("awful.layout.suit.vile")
module("awful.layout.suit.tile")
local function tile_group(cls, wa, orientation, fact, group)
-- get our orientation right
@ -79,7 +79,7 @@ local function tile_group(cls, wa, orientation, fact, group)
end
local function vile(_, screen, orientation)
local function tile(_, screen, orientation)
orientation = orientation or "right"
-- this handles are different orientations
@ -159,19 +159,19 @@ end
--- The main tile algo, on left.
-- @param screen The screen number to tile.
function left(screen)
return vile(nil, screen, "left")
return tile(nil, screen, "left")
end
--- The main tile algo, on bottom.
-- @param screen The screen number to tile.
function bottom(screen)
return vile(nil, screen, "bottom")
return tile(nil, screen, "bottom")
end
--- The main tile algo, on top.
-- @param screen The screen number to tile.
function top(screen)
return vile(nil, screen, "top")
return tile(nil, screen, "top")
end
setmetatable(_M, { __call = vile })
setmetatable(_M, { __call = tile })

View File

@ -349,14 +349,14 @@ local function client_resize_magnifier(c, corner)
end, corner .. "_corner")
end
local function client_resize_viled(c, lay)
local function client_resize_tiled(c, lay)
local wa = capi.screen[c.screen].workarea
local mwfact = tag.getmwfact()
local cursor
local g = c:geometry()
local offset = 0
local x,y
if lay == layout.suit.vile then
if lay == layout.suit.tile then
cursor = "cross"
if g.height+15 > wa.height then
offset = g.height * .5
@ -365,7 +365,7 @@ local function client_resize_viled(c, lay)
offset = g.height
end
capi.mouse.coords({ x = wa.x + wa.width * mwfact, y = g.y + offset })
elseif lay == layout.suit.vile.left then
elseif lay == layout.suit.tile.left then
cursor = "cross"
if g.height+15 >= wa.height then
offset = g.height * .5
@ -374,7 +374,7 @@ local function client_resize_viled(c, lay)
offset = g.height
end
capi.mouse.coords({ x = wa.x + wa.width * (1 - mwfact), y = g.y + offset })
elseif lay == layout.suit.vile.bottom then
elseif lay == layout.suit.tile.bottom then
cursor = "cross"
if g.width+15 >= wa.width then
offset = g.width * .5
@ -420,13 +420,13 @@ local function client_resize_viled(c, lay)
end
if lay == layout.suit.vile then
if lay == layout.suit.tile then
mwfact = fact_x
wfact = wfact_y
elseif lay == layout.suit.vile.left then
elseif lay == layout.suit.tile.left then
mwfact = 1 - fact_x
wfact = wfact_y
elseif lay == layout.suit.vile.bottom then
elseif lay == layout.suit.tile.bottom then
mwfact = fact_y
wfact = wfact_x
else
@ -529,12 +529,12 @@ function client.resize(c, corner)
if lay == layout.suit.floating or aclient.floating.get(c) then
return client_resize_floating(c, corner, fixed_x, fixed_y)
elseif lay == layout.suit.vile
or lay == layout.suit.vile.left
or lay == layout.suit.vile.top
or lay == layout.suit.vile.bottom
elseif lay == layout.suit.tile
or lay == layout.suit.tile.left
or lay == layout.suit.tile.top
or lay == layout.suit.tile.bottom
then
return client_resize_viled(c, lay)
return client_resize_tiled(c, lay)
elseif lay == layout.suit.magnifier then
return client_resize_magnifier(c, corner)
end

View File

Before

Width:  |  Height:  |  Size: 174 B

After

Width:  |  Height:  |  Size: 174 B

View File

Before

Width:  |  Height:  |  Size: 195 B

After

Width:  |  Height:  |  Size: 195 B

View File

Before

Width:  |  Height:  |  Size: 216 B

After

Width:  |  Height:  |  Size: 216 B

View File

Before

Width:  |  Height:  |  Size: 172 B

After

Width:  |  Height:  |  Size: 172 B

View File

Before

Width:  |  Height:  |  Size: 170 B

After

Width:  |  Height:  |  Size: 170 B

View File

Before

Width:  |  Height:  |  Size: 195 B

After

Width:  |  Height:  |  Size: 195 B

View File

Before

Width:  |  Height:  |  Size: 215 B

After

Width:  |  Height:  |  Size: 215 B

View File

Before

Width:  |  Height:  |  Size: 168 B

After

Width:  |  Height:  |  Size: 168 B

View File

@ -56,9 +56,9 @@ layout_fairv = @AWESOME_THEMES_PATH@/default/layouts/fairvw.png
layout_floating = @AWESOME_THEMES_PATH@/default/layouts/floatingw.png
layout_magnifier = @AWESOME_THEMES_PATH@/default/layouts/magnifierw.png
layout_max = @AWESOME_THEMES_PATH@/default/layouts/maxw.png
layout_vilebottom = @AWESOME_THEMES_PATH@/default/layouts/vilebottomw.png
layout_vileleft = @AWESOME_THEMES_PATH@/default/layouts/vileleftw.png
layout_vile = @AWESOME_THEMES_PATH@/default/layouts/vilew.png
layout_viletop = @AWESOME_THEMES_PATH@/default/layouts/viletopw.png
layout_tilebottom = @AWESOME_THEMES_PATH@/default/layouts/tilebottomw.png
layout_tileleft = @AWESOME_THEMES_PATH@/default/layouts/tileleftw.png
layout_tile = @AWESOME_THEMES_PATH@/default/layouts/tilew.png
layout_tiletop = @AWESOME_THEMES_PATH@/default/layouts/tiletopw.png
awesome_icon = @AWESOME_ICON_PATH@/awesome16.png

View File

Before

Width:  |  Height:  |  Size: 383 B

After

Width:  |  Height:  |  Size: 383 B

View File

Before

Width:  |  Height:  |  Size: 335 B

After

Width:  |  Height:  |  Size: 335 B

View File

Before

Width:  |  Height:  |  Size: 367 B

After

Width:  |  Height:  |  Size: 367 B

View File

Before

Width:  |  Height:  |  Size: 340 B

After

Width:  |  Height:  |  Size: 340 B

View File

@ -27,10 +27,10 @@ layout_floating = @AWESOME_THEMES_PATH@/sky/layouts/floating.png
layout_magnifier = @AWESOME_THEMES_PATH@/sky/layouts/magnifier.png
layout_max = @AWESOME_THEMES_PATH@/sky/layouts/max.png
layout_fullscreen = @AWESOME_THEMES_PATH@/sky/layouts/fullscreen.png
layout_vilebottom = @AWESOME_THEMES_PATH@/sky/layouts/vilebottom.png
layout_vileleft = @AWESOME_THEMES_PATH@/sky/layouts/vileleft.png
layout_vile = @AWESOME_THEMES_PATH@/sky/layouts/vile.png
layout_viletop = @AWESOME_THEMES_PATH@/sky/layouts/viletop.png
layout_tilebottom = @AWESOME_THEMES_PATH@/sky/layouts/tilebottom.png
layout_tileleft = @AWESOME_THEMES_PATH@/sky/layouts/tileleft.png
layout_tile = @AWESOME_THEMES_PATH@/sky/layouts/tile.png
layout_tiletop = @AWESOME_THEMES_PATH@/sky/layouts/tiletop.png
awesome_icon = @AWESOME_THEMES_PATH@/sky/awesome-icon.png
tasklist_floating_icon = @AWESOME_THEMES_PATH@/sky/layouts/floating.png