Fix an if statement getting moved into a loop it shouldn't have

[mikachu/openbox.git] / openbox / place.c

diff --git a/openbox/place.c b/openbox/place.c
index 1dc16c4..de2c7dc 100644 (file)
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -295,28 +295,8 @@ static gboolean place_per_app_setting_position(ObClient *client, Rect *screen,
 
     ob_debug("placing by per-app settings");
 
-    if (settings->position.x.center)
-        *x = screen->width / 2 - client->area.width / 2;
-    else {
-        *x = settings->position.x.pos;
-        if (settings->position.x.denom)
-            *x = (*x * screen->width) / settings->position.x.denom;
-        if (settings->position.x.opposite)
-            *x = screen->width - frame_size.width - *x;
-    }
-
-    if (settings->position.y.center)
-        *y = screen->height / 2 - client->area.height / 2;
-    else {
-        *y = settings->position.y.pos;
-        if (settings->position.y.denom)
-            *y = (*y * screen->height) / settings->position.y.denom;
-        if (settings->position.y.opposite)
-            *y = screen->height - frame_size.height - *y;
-    }
-
-    *x += screen->x;
-    *y += screen->y;
+    screen_apply_gravity_point(x, y, frame_size.width, frame_size.height,
+                               &settings->position, screen);
 
     return TRUE;
 }
@@ -380,11 +360,11 @@ static gboolean place_transient_splash(ObClient *client, Rect *area,
                     b = MAX(b, RECT_BOTTOM(m->frame->area));
                 }
             }
-            if (!first) {
-                *x = ((r + 1 - l) - frame_size.width) / 2 + l;
-                *y = ((b + 1 - t) - frame_size.height) / 2 + t;
-                return TRUE;
-            }
+        }
+        if (!first) {
+            *x = ((r + 1 - l) - frame_size.width) / 2 + l;
+            *y = ((b + 1 - t) - frame_size.height) / 2 + t;
+            return TRUE;
         }
     }