[Xfce4-commits] [xfce/xfwm4] 01/01: Allow tiling and workspace wrap on move

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

olivier pushed a commit to branch master
in repository xfce/xfwm4.

commit 5cb4d8032bb32a3d64ac9b6a84427203f058473f
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Sun Jan 11 11:22:56 2015 +0100

    Allow tiling and workspace wrap on move
    
    Signed-off-by: Olivier Fourdan <fourdan at xfce.org>
---
 src/moveresize.c |   28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/moveresize.c b/src/moveresize.c
index 8fec776..73ac570 100644
--- a/src/moveresize.c
+++ b/src/moveresize.c
@@ -779,28 +779,22 @@ clientMoveTile (Client *c, XMotionEvent *xevent)
     layout = screen_info->desktop_layout;
     dist = MIN (TILE_DISTANCE, frameDecorationTop (screen_info) / 2);
 
-    if (!screen_info->params->wrap_windows || layout.cols < 2)
+    if ((x >= disp_x - 1) && (x < disp_x + dist) &&
+        (y >= disp_y - 1) && (y < disp_max_y + 1))
     {
-        if ((x >= disp_x - 1) && (x < disp_x + dist) &&
-            (y >= disp_y - 1) && (y < disp_max_y + 1))
-        {
-            return clientTile (c, x, y, TILE_LEFT, !screen_info->params->box_move);
-        }
+        return clientTile (c, x, y, TILE_LEFT, !screen_info->params->box_move);
+    }
 
-        if ((x >= disp_max_x - dist) && (x < disp_max_x + 1) &&
-            (y >= disp_y - 1) && (y < disp_max_y + 1))
-        {
-            return clientTile (c, x, y, TILE_RIGHT, !screen_info->params->box_move);
-        }
+    if ((x >= disp_max_x - dist) && (x < disp_max_x + 1) &&
+        (y >= disp_y - 1) && (y < disp_max_y + 1))
+    {
+        return clientTile (c, x, y, TILE_RIGHT, !screen_info->params->box_move);
     }
 
-    if (!screen_info->params->wrap_windows || layout.rows < 2)
+    if ((x >= disp_x - 1) && (x < disp_max_x + 1) &&
+        (y >= disp_y - 1) && (y < disp_y + dist))
     {
-        if ((x >= disp_x - 1) && (x < disp_max_x + 1) &&
-            (y >= disp_y - 1) && (y < disp_y + dist))
-        {
-            return clientToggleMaximized (c, CLIENT_FLAG_MAXIMIZED, FALSE);
-        }
+        return clientToggleMaximized (c, CLIENT_FLAG_MAXIMIZED, FALSE);
     }
 
     return FALSE;

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.