fix typo; closes #311

[etc/awesome.git] / util / init.lua

diff --git a/util/init.lua b/util/init.lua
index 5596afa1aee19c196c935ea7915a988ef66ea835..78889bc33e7dab63aad690431ffb98fb2be6c904 100644 (file)
--- a/util/init.lua
+++ b/util/init.lua
@@ -13,14 +13,10 @@
 --]]
 
 local awful        = require("awful")
 --]]
 
 local awful        = require("awful")

-local beautiful    = require("beautiful")
-local math         = { sqrt = math.sqrt }
+local sqrt         = math.sqrt

 local pairs        = pairs
 local pairs        = pairs

-local string       = { gsub = string.gsub }

 local client       = client
 local client       = client

-local screen       = screen

 local tonumber     = tonumber
 local tonumber     = tonumber

-

 local wrequire     = require("lain.helpers").wrequire
 local setmetatable = setmetatable
 
 local wrequire     = require("lain.helpers").wrequire
 local setmetatable = setmetatable
 


@@ -71,29 +67,28 @@ function util.menu_clients_current_tags(menu, args)
 end
 
 -- Magnify a client: set it to "float" and resize it.
 end
 
 -- Magnify a client: set it to "float" and resize it.

-function util.magnify_client(c)
+function util.magnify_client(c, width_f, height_f)

     if c and not c.floating then
     if c and not c.floating then

-        util.mc(c)

         util.magnified_client = c
         util.magnified_client = c

+        util.mc(c, width_f, height_f)

     else
     else

-        c.floating = false

         util.magnified_client = nil
         util.magnified_client = nil

+        c.floating = false

     end
 end
 
 -- https://github.com/copycat-killer/lain/issues/195
     end
 end
 
 -- https://github.com/copycat-killer/lain/issues/195

-function util.mc(c)
+function util.mc(c, width_f, height_f)

     c = c or util.magnified_client
     if not c then return end
 
     c.floating   = true
     local s      = awful.screen.focused()
     c = c or util.magnified_client
     if not c then return end
 
     c.floating   = true
     local s      = awful.screen.focused()

-    local mg     = s.geometry
-    local tag    = s.selected_tag
-    local mwfact = beautiful.master_width_factor or 0.5
+    local mg     = s.workarea

     local g      = {}
     local g      = {}

-    g.width      = math.sqrt(mwfact) * mg.width
-    g.height     = math.sqrt(mwfact) * mg.height
+    local mwfact = width_f or s.selected_tag.master_width_factor or 0.5
+    g.width      = sqrt(mwfact) * mg.width
+    g.height     = sqrt(height_f or mwfact) * mg.height

     g.x          = mg.x + (mg.width - g.width) / 2
     g.y          = mg.y + (mg.height - g.height) / 2
 
     g.x          = mg.x + (mg.width - g.width) / 2
     g.y          = mg.y + (mg.height - g.height) / 2
 


@@ -146,11 +141,10 @@ end
 -- pos in {-1, 1} <-> {previous, next} tag position
 function util.move_tag(pos)
     local tag = awful.screen.focused().selected_tag
 -- pos in {-1, 1} <-> {previous, next} tag position
 function util.move_tag(pos)
     local tag = awful.screen.focused().selected_tag

-    local idx = awful.tag.getidx(tag)

     if tonumber(pos) <= -1 then
     if tonumber(pos) <= -1 then

-        awful.tag.move(idx - 1, tag)
+        awful.tag.move(tag.index - 1, tag)

     else
     else

-        awful.tag.move(idx + 1, tag)
+        awful.tag.move(tag.index + 1, tag)

     end
 end
 
     end
 end
 


@@ -166,8 +160,9 @@ end
 
 -- On the fly useless gaps change
 function util.useless_gaps_resize(thatmuch)
 
 -- On the fly useless gaps change
 function util.useless_gaps_resize(thatmuch)

-    beautiful.useless_gap = tonumber(beautiful.useless_gap) + thatmuch
-    awful.layout.arrange(awful.screen.focused())
+    local scr = awful.screen.focused()
+    scr.selected_tag.gap = scr.selected_tag.gap + tonumber(thatmuch)
+    awful.layout.arrange(scr)

 end
 
 return setmetatable(util, { __index = wrequire })
 end
 
 return setmetatable(util, { __index = wrequire })