]> git.madduck.net Git - etc/awesome.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

util: magnify_client/mc: added width and height factors as optional args
authorcopycat-killer <dada@archlinux.info>
Mon, 6 Feb 2017 16:34:08 +0000 (17:34 +0100)
committercopycat-killer <dada@archlinux.info>
Mon, 6 Feb 2017 16:34:08 +0000 (17:34 +0100)
util/init.lua

index 9c4dc063ddb14a214c6b5521ba846b0bd1263f34..78889bc33e7dab63aad690431ffb98fb2be6c904 100644 (file)
@@ -67,28 +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 mwfact = s.selected_tag.master_width_factor or 0.5
+    local mg     = s.workarea
     local g      = {}
     local g      = {}
+    local mwfact = width_f or s.selected_tag.master_width_factor or 0.5
     g.width      = sqrt(mwfact) * mg.width
     g.width      = sqrt(mwfact) * mg.width
-    g.height     = sqrt(mwfact) * mg.height
+    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