From 492fb05d1b6704302414789760d035416d115a6e Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Fri, 4 May 2007 23:24:54 +0000 Subject: [PATCH] fix some failed merging and merge r6034 from trunk --- openbox/place.c | 4 ++-- tests/grav.c | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/openbox/place.c b/openbox/place.c index 1ac295c0..8003270e 100644 --- a/openbox/place.c +++ b/openbox/place.c @@ -282,7 +282,7 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y, if (WINDOW_IS_CLIENT(it->data)) { c = it->data; - if (c->fullscreen) + if (c->fullscreen || (c->max_vert && c->max_horz)) continue; } else continue; @@ -306,7 +306,7 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y, if (WINDOW_IS_CLIENT(it->data)) { c = it->data; - if (c->fullscreen) + if (c->fullscreen || (c->max_vert && c->max_horz)) continue; } else continue; diff --git a/tests/grav.c b/tests/grav.c index 2cbc3000..5aeed8bc 100644 --- a/tests/grav.c +++ b/tests/grav.c @@ -49,14 +49,9 @@ int main () { XMapWindow(display, win); XFlush(display); -<<<<<<< .working - XMoveWindow(display, win, 960-1, 600-1); - -======= XMoveResizeWindow(display, win, 960-1, 600-1, 600, 150); /*XResizeWindow(display, win, 600, 150);*/ ->>>>>>> .merge-right.r5963 XSelectInput(display, win, ExposureMask | StructureNotifyMask); while (1) { -- 2.34.1