summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2009-01-10 10:54:34 +0100
committerDanny Baumann <dannybaumann@web.de>2009-01-10 10:54:34 +0100
commit1989f56e01fc0ec611679a4e86b1062f05b7acaf (patch)
tree65f61113abcf30dfd5bc72fd40f12367bcf740a3
parentfb760c22188eec44d90e00309f49ddebd16c81f8 (diff)
Reduce indention depth.
-rw-r--r--src/screen.c92
1 files changed, 46 insertions, 46 deletions
diff --git a/src/screen.c b/src/screen.c
index 5d8fa9c5..16ff86a6 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -3159,65 +3159,65 @@ computeWorkareaForBox (CompScreen *s,
if (!w->mapNum)
continue;
- if (w->struts)
- {
- r.extents.y1 = pBox->y1;
- r.extents.y2 = pBox->y2;
+ if (!w->struts)
+ continue;
- x1 = w->struts->left.x;
- y1 = w->struts->left.y;
- x2 = x1 + w->struts->left.width;
- y2 = y1 + w->struts->left.height;
+ r.extents.y1 = pBox->y1;
+ r.extents.y2 = pBox->y2;
- if (y1 < pBox->y2 && y2 > pBox->y1)
- {
- r.extents.x1 = x1;
- r.extents.x2 = x2;
+ x1 = w->struts->left.x;
+ y1 = w->struts->left.y;
+ x2 = x1 + w->struts->left.width;
+ y2 = y1 + w->struts->left.height;
- XSubtractRegion (region, &r, region);
- }
+ if (y1 < pBox->y2 && y2 > pBox->y1)
+ {
+ r.extents.x1 = x1;
+ r.extents.x2 = x2;
- x1 = w->struts->right.x;
- y1 = w->struts->right.y;
- x2 = x1 + w->struts->right.width;
- y2 = y1 + w->struts->right.height;
+ XSubtractRegion (region, &r, region);
+ }
- if (y1 < pBox->y2 && y2 > pBox->y1)
- {
- r.extents.x1 = x1;
- r.extents.x2 = x2;
+ x1 = w->struts->right.x;
+ y1 = w->struts->right.y;
+ x2 = x1 + w->struts->right.width;
+ y2 = y1 + w->struts->right.height;
- XSubtractRegion (region, &r, region);
- }
+ if (y1 < pBox->y2 && y2 > pBox->y1)
+ {
+ r.extents.x1 = x1;
+ r.extents.x2 = x2;
- r.extents.x1 = pBox->x1;
- r.extents.x2 = pBox->x2;
+ XSubtractRegion (region, &r, region);
+ }
- x1 = w->struts->top.x;
- y1 = w->struts->top.y;
- x2 = x1 + w->struts->top.width;
- y2 = y1 + w->struts->top.height;
+ r.extents.x1 = pBox->x1;
+ r.extents.x2 = pBox->x2;
- if (x1 < pBox->x2 && x2 > pBox->x1)
- {
- r.extents.y1 = y1;
- r.extents.y2 = y2;
+ x1 = w->struts->top.x;
+ y1 = w->struts->top.y;
+ x2 = x1 + w->struts->top.width;
+ y2 = y1 + w->struts->top.height;
- XSubtractRegion (region, &r, region);
- }
+ if (x1 < pBox->x2 && x2 > pBox->x1)
+ {
+ r.extents.y1 = y1;
+ r.extents.y2 = y2;
- x1 = w->struts->bottom.x;
- y1 = w->struts->bottom.y;
- x2 = x1 + w->struts->bottom.width;
- y2 = y1 + w->struts->bottom.height;
+ XSubtractRegion (region, &r, region);
+ }
- if (x1 < pBox->x2 && x2 > pBox->x1)
- {
- r.extents.y1 = y1;
- r.extents.y2 = y2;
+ x1 = w->struts->bottom.x;
+ y1 = w->struts->bottom.y;
+ x2 = x1 + w->struts->bottom.width;
+ y2 = y1 + w->struts->bottom.height;
- XSubtractRegion (region, &r, region);
- }
+ if (x1 < pBox->x2 && x2 > pBox->x1)
+ {
+ r.extents.y1 = y1;
+ r.extents.y2 = y2;
+
+ XSubtractRegion (region, &r, region);
}
}