centerwork: mouse_resize_handler added; #395

diff --git a/icons/cal/black/17.png b/icons/cal/black/17.png
index 08dc21b316d7b9dc02aa89aa1c0b40b0b9f988ea..f3fa0a997e607ce485c4d5a9cfce4a799f965f32 100644 (file)
Binary files a/icons/cal/black/17.png and b/icons/cal/black/17.png differ

diff --git a/layout/centerwork.lua b/layout/centerwork.lua
index cb8370933b660ae496cf562780f7c477f871f4f4..bf0c0ca18d7249dce00895ab5e9adab68d04a9b6 100644 (file)
--- a/layout/centerwork.lua
+++ b/layout/centerwork.lua
@@ -1,6 +1,7 @@
 --[[
 
      Licensed under GNU General Public License v2
+      * (c) 2018,      Eugene Pakhomov
       * (c) 2016,      Henrik Antonsson
       * (c) 2015,      Joerg Jaspert
       * (c) 2014,      projektile
@@ -9,7 +10,7 @@
 
 --]]
 
-local floor, max, screen = math.floor, math.max, screen
+local capi, floor, max, screen = capi, math.floor, math.max, screen
 
 local centerwork = {
     name       = "centerwork",
@@ -124,6 +125,56 @@ local function arrange(p, layout)
     end
 end
 
+local function mouse_resize_handler(c, corner, x, y, orientation)
+    local wa     = c.screen.workarea
+    local mwfact = c.screen.selected_tag.master_width_factor
+    local g      = c:geometry()
+    local offset = 0
+    local cursor = "cross"
+
+    local corner_coords
+
+    if orientation == 'vertical' then
+        if g.height + 15 >= wa.height then
+            offset = g.height * .5
+            cursor = "sb_h_double_arrow"
+        elseif not (g.y + g.height + 15 > wa.y + wa.height) then
+            offset = g.height
+        end
+        corner_coords = { x = wa.x + wa.width * (1 - mwfact) / 2, y = g.y + offset }
+    else
+        if g.width + 15 >= wa.width then
+            offset = g.width * .5
+            cursor = "sb_v_double_arrow"
+        elseif not (g.x + g.width + 15 > wa.x + wa.width) then
+            offset = g.width
+        end
+        corner_coords = { y = wa.y + wa.height * (1 - mwfact) / 2, x = g.x + offset }
+    end
+
+    capi.mouse.coords(corner_coords)
+
+    local prev_coords = {}
+
+    capi.mousegrabber.run(function(_mouse)
+        if not c.valid then return false end
+        for _, v in ipairs(_mouse.buttons) do
+            if v then
+                prev_coords = { x = _mouse.x, y = _mouse.y }
+                local new_mwfact
+                if orientation == 'vertical' then
+                    new_mwfact = 1 - (_mouse.x - wa.x) / wa.width * 2
+                else
+                    new_mwfact = 1 - (_mouse.y - wa.y) / wa.height * 2
+                end
+                c.screen.selected_tag.master_width_factor = math.min(math.max(new_mwfact, 0.01), 0.99)
+                return true
+            end
+        end
+        return prev_coords.x == _mouse.x and prev_coords.y == _mouse.y
+    end, cursor)
+end
+
 function centerwork.arrange(p)
     return arrange(p, centerwork)
 end
@@ -132,4 +183,12 @@ function centerwork.horizontal.arrange(p)
     return arrange(p, centerwork.horizontal)
 end
 
+function centerwork.mouse_resize_handler(c, corner, x, y)
+    return mouse_resize_handler(c, corner, x, y, 'vertical')
+end
+
+function centerwork.horizontal.mouse_resize_handler(c, corner, x, y)
+    return mouse_resize_handler(c, corner, x, y, 'horizontal')
+end
+
 return centerwork

diff --git a/widget/contrib/task.lua b/widget/contrib/task.lua
index 7de1967a0d4bf15866d6a3992f4478447ab4a11e..6c327517406ec10d045e5887acd9296da9b8eaa2 100644 (file)
--- a/widget/contrib/task.lua
+++ b/widget/contrib/task.lua
@@ -23,7 +23,6 @@ function task.hide()
 end
 
 function task.show(scr)
-
     if task.followtag then
         task.notification_preset.screen = awful.screen.focused()
     elseif scr then

diff --git a/wiki b/wiki
index 278c3c6c5b670640742e4a72ea571b4d656aa9dd..abaf929d0f77d7a268c6390a24ad9258049e5623 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 278c3c6c5b670640742e4a72ea571b4d656aa9dd
+Subproject commit abaf929d0f77d7a268c6390a24ad9258049e5623