From 6005c3c86135ce9a7e95abacf275f94c440094c7 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Wed, 13 Jun 2007 12:06:23 +0000 Subject: [PATCH] fix the optimize --- openbox/screen.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openbox/screen.c b/openbox/screen.c index 054a1c5e..3962fd2a 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -1341,28 +1341,28 @@ Rect* screen_area(guint desktop, guint head, Rect *search) for (it = struts_left; it; it = g_slist_next(it)) { ObScreenStrut *s = it->data; - if (s->desktop == d && + if ((s->desktop == d || s->desktop == DESKTOP_ALL) && STRUT_LEFT_IN_SEARCH(s->strut, search) && !STRUT_LEFT_IGNORE(s->strut, us, search)) l = MAX(l, al + s->strut->left); } for (it = struts_top; it; it = g_slist_next(it)) { ObScreenStrut *s = it->data; - if (s->desktop == d && + if ((s->desktop == d || s->desktop == DESKTOP_ALL) && STRUT_TOP_IN_SEARCH(s->strut, search) && !STRUT_TOP_IGNORE(s->strut, us, search)) t = MAX(t, at + s->strut->top); } for (it = struts_right; it; it = g_slist_next(it)) { ObScreenStrut *s = it->data; - if (s->desktop == d && + if ((s->desktop == d || s->desktop == DESKTOP_ALL) && STRUT_RIGHT_IN_SEARCH(s->strut, search) && !STRUT_RIGHT_IGNORE(s->strut, us, search)) r = MIN(r, ar - s->strut->right); } for (it = struts_bottom; it; it = g_slist_next(it)) { ObScreenStrut *s = it->data; - if (s->desktop == d && + if ((s->desktop == d || s->desktop == DESKTOP_ALL) && STRUT_BOTTOM_IN_SEARCH(s->strut, search) && !STRUT_BOTTOM_IGNORE(s->strut, us, search)) b = MIN(b, ab - s->strut->bottom); -- 2.44.0