diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-06-13 12:06:23 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2007-06-13 12:06:23 +0000 |
| commit | 6005c3c86135ce9a7e95abacf275f94c440094c7 (patch) | |
| tree | dfbab715fb19c2b57986effdc7fc6e42a2ad0440 | |
| parent | 33ef4736c078f7f0b1b7e8cb8124dd2f31b6c092 (diff) | |
fix the optimize
| -rw-r--r-- | openbox/screen.c | 8 |
1 files 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); |