Merge branch 'Veratil-awesome-v4-layout-fix'

[etc/awesome.git] / layout / cascade.lua

diff --git a/layout/cascade.lua b/layout/cascade.lua
index 2397a1d00d519b5e97f96c86f060b4b9a480c03d..2b02c000fb0d2468361b267b7f4c7cdcd9ad000a 100644 (file)
--- a/layout/cascade.lua
+++ b/layout/cascade.lua
@@ -8,14 +8,14 @@
                                                   
 --]]
 
                                                   
 --]]
 

-local tag      = require("awful.tag")
+local scr      = require("awful.screen")

 local tonumber = tonumber
 
 local cascade = {
     name     = "cascade",
     nmaster  = 0,
     offset_x = 32,
 local tonumber = tonumber
 
 local cascade = {
     name     = "cascade",
     nmaster  = 0,
     offset_x = 32,

-    offset_y = 8, 
+    offset_y = 8,

     tile     = {
         name          = "cascadetile",
         nmaster       = 0,
     tile     = {
         name          = "cascadetile",
         nmaster       = 0,


@@ -31,11 +31,14 @@ local function do_cascade(p, tiling)
     -- Screen.
     local wa  = p.workarea
     local cls = p.clients
     -- Screen.
     local wa  = p.workarea
     local cls = p.clients

+    local ta = scr.focused().selected_tag
+
+    if not ta then return end

 
     if #cls <= 0 then return end
 
     -- Useless gaps.
 
     if #cls <= 0 then return end
 
     -- Useless gaps.

-    local useless_gap = tag.gap or 0
+    local useless_gap = p.useless_gap or 0

 
     if not tiling then
         -- Cascade windows.
 
     if not tiling then
         -- Cascade windows.


@@ -44,7 +47,7 @@ local function do_cascade(p, tiling)
         if cascade.nmaster > 0 then
             num_c = cascade.nmaster
         else
         if cascade.nmaster > 0 then
             num_c = cascade.nmaster
         else

-            num_c = tag.master_count
+            num_c = ta.master_count

         end
 
         -- Opening a new window will usually force all existing windows to
         end
 
         -- Opening a new window will usually force all existing windows to


@@ -89,7 +92,7 @@ local function do_cascade(p, tiling)
         if cascade.tile.mwfact > 0 then
             mwfact = cascade.tile.mwfact
         else
         if cascade.tile.mwfact > 0 then
             mwfact = cascade.tile.mwfact
         else

-            mwfact = tag.getmwfact(t)
+            mwfact = ta.master_width_factor

         end
 
         -- Make slave windows overlap main window? Do this if ncol is 1.
         end
 
         -- Make slave windows overlap main window? Do this if ncol is 1.


@@ -97,7 +100,7 @@ local function do_cascade(p, tiling)
         if cascade.tile.ncol > 0 then
             overlap_main = cascade.tile.ncol
         else
         if cascade.tile.ncol > 0 then
             overlap_main = cascade.tile.ncol
         else

-            overlap_main = tag.column_count
+            overlap_main = ta.column_count

         end
 
         -- Minimum space for slave windows? See cascade.tile.lua.
         end
 
         -- Minimum space for slave windows? See cascade.tile.lua.


@@ -105,7 +108,7 @@ local function do_cascade(p, tiling)
         if cascade.tile.nmaster > 0 then
             num_c = cascade.tile.nmaster
         else
         if cascade.tile.nmaster > 0 then
             num_c = cascade.tile.nmaster
         else

-            num_c = tag.master_count
+            num_c = ta.master_count

         end
 
         local how_many = (#cls - 1 >= num_c and (#cls - 1)) or num_c
         end
 
         local how_many = (#cls - 1 >= num_c and (#cls - 1)) or num_c