summarylogtreecommitdiffstats
path: root/gaps.patch
diff options
context:
space:
mode:
Diffstat (limited to 'gaps.patch')
-rw-r--r--gaps.patch62
1 files changed, 29 insertions, 33 deletions
diff --git a/gaps.patch b/gaps.patch
index 744debb35964..9c1b86319dec 100644
--- a/gaps.patch
+++ b/gaps.patch
@@ -1,8 +1,6 @@
-diff --git a/src/client.c b/src/client.c
-index 3923dd98b..009f3dd58 100644
---- a/src/client.c
-+++ b/src/client.c
-@@ -3296,6 +3296,9 @@ clientNewMaxState (Client *c, XWindowChanges *wc, int mode)
+--- a/src/client.c 2022-12-01 11:47:40.000000000 +0100
++++ b/src/client.c 2022-12-22 23:26:04.000673794 +0100
+@@ -3292,6 +3292,9 @@
}
}
@@ -12,10 +10,10 @@ index 3923dd98b..009f3dd58 100644
static gboolean
clientNewTileSize (Client *c, XWindowChanges *wc, GdkRectangle *rect, tilePositionType tile)
{
-@@ -3331,36 +3334,72 @@ clientNewTileSize (Client *c, XWindowChanges *wc, GdkRectangle *rect, tilePositi
- wc->y = full_y + frameExtentTop (c);
- wc->width = full_w / 2 - frameExtentLeft (c) - frameExtentRight (c);
- wc->height = full_h - frameExtentTop (c) - frameExtentBottom (c);
+@@ -3318,36 +3321,70 @@
+ wc->y = full.y + frameExtentTop (c);
+ wc->width = full.width / 2 - frameExtentLeft (c) - frameExtentRight (c);
+ wc->height = full.height - frameExtentTop (c) - frameExtentBottom (c);
+
+ wc->x += GAPS_SIZE;
+ wc->y += GAPS_SIZE;
@@ -24,10 +22,10 @@ index 3923dd98b..009f3dd58 100644
+
break;
case TILE_RIGHT:
- wc->x = full_x + full_w / 2 + frameExtentLeft (c);
- wc->y = full_y + frameExtentTop (c);
- wc->width = full_w - full_w / 2 - frameExtentLeft (c) - frameExtentRight (c);
- wc->height = full_h - frameExtentTop (c) - frameExtentBottom (c);
+ wc->x = full.x + full.width / 2 + frameExtentLeft (c);
+ wc->y = full.y + frameExtentTop (c);
+ wc->width = full.width - full.width / 2 - frameExtentLeft (c) - frameExtentRight (c);
+ wc->height = full.height - frameExtentTop (c) - frameExtentBottom (c);
+
+ wc->x += GAPS_SIZE / 2;
+ wc->y += GAPS_SIZE;
@@ -36,11 +34,10 @@ index 3923dd98b..009f3dd58 100644
+
break;
case TILE_DOWN_LEFT:
- wc->x = full_x + frameExtentLeft (c);
- wc->y = full_y + full_h / 2 + frameExtentTop (c);
- wc->width = full_w / 2 - frameExtentLeft (c) - frameExtentRight (c);
- wc->height = full_h - full_h / 2 - frameExtentTop (c) - frameExtentBottom (c);
-+
+ wc->x = full.x + frameExtentLeft (c);
+ wc->y = full.y + full.height / 2 + frameExtentTop (c);
+ wc->width = full.width / 2 - frameExtentLeft (c) - frameExtentRight (c);
+ wc->height = full.height - full.height / 2 - frameExtentTop (c) - frameExtentBottom (c);
+ wc->x += GAPS_SIZE;
+ wc->y += GAPS_SIZE / 2;
+ wc->width -= GAPS_SIZE + (GAPS_SIZE / 2);
@@ -48,11 +45,10 @@ index 3923dd98b..009f3dd58 100644
+
break;
case TILE_DOWN_RIGHT:
- wc->x = full_x + full_w /2 + frameExtentLeft (c);
- wc->y = full_y + full_h / 2 + frameExtentTop (c);
- wc->width = full_w - full_w / 2 - frameExtentLeft (c) - frameExtentRight (c);
- wc->height = full_h - full_h / 2 - frameExtentTop (c) - frameExtentBottom (c);
-+
+ wc->x = full.x + full.width /2 + frameExtentLeft (c);
+ wc->y = full.y + full.height / 2 + frameExtentTop (c);
+ wc->width = full.width - full.width / 2 - frameExtentLeft (c) - frameExtentRight (c);
+ wc->height = full.height - full.height / 2 - frameExtentTop (c) - frameExtentBottom (c);
+ wc->x += GAPS_SIZE / 2;
+ wc->y += GAPS_SIZE / 2;
+ wc->width -= GAPS_SIZE + (GAPS_SIZE / 2);
@@ -60,10 +56,10 @@ index 3923dd98b..009f3dd58 100644
+
break;
case TILE_UP_LEFT:
- wc->x = full_x + frameExtentLeft (c);
- wc->y = full_y + frameExtentTop (c);
- wc->width = full_w / 2 - frameExtentLeft (c) - frameExtentRight (c);
- wc->height = full_h / 2 - frameExtentTop (c) - frameExtentBottom (c);
+ wc->x = full.x + frameExtentLeft (c);
+ wc->y = full.y + frameExtentTop (c);
+ wc->width = full.width / 2 - frameExtentLeft (c) - frameExtentRight (c);
+ wc->height = full.height / 2 - frameExtentTop (c) - frameExtentBottom (c);
+
+ wc->x += GAPS_SIZE;
+ wc->y += GAPS_SIZE;
@@ -72,10 +68,10 @@ index 3923dd98b..009f3dd58 100644
+
break;
case TILE_UP_RIGHT:
- wc->x = full_x + full_w /2 + frameExtentLeft (c);
- wc->y = full_y + frameExtentTop (c);
- wc->width = full_w - full_w / 2 - frameExtentLeft (c) - frameExtentRight (c);
- wc->height = full_h / 2 - frameExtentTop (c) - frameExtentBottom (c);
+ wc->x = full.x + full.width /2 + frameExtentLeft (c);
+ wc->y = full.y + frameExtentTop (c);
+ wc->width = full.width - full.width / 2 - frameExtentLeft (c) - frameExtentRight (c);
+ wc->height = full.height / 2 - frameExtentTop (c) - frameExtentBottom (c);
+
+ wc->x += GAPS_SIZE / 2;
+ wc->y += GAPS_SIZE;
@@ -85,8 +81,8 @@ index 3923dd98b..009f3dd58 100644
break;
default:
break;
-@@ -3400,6 +3439,11 @@ clientNewMaxSize (Client *c, XWindowChanges *wc, GdkRectangle *rect)
- wc->height = full_h - frameExtentTop (c) - frameExtentBottom (c);
+@@ -3378,6 +3415,11 @@
+ wc->height = full.height - frameExtentTop (c) - frameExtentBottom (c);
}
+ wc->x += GAPS_SIZE;