Revert "Fixed regression when placing windows."
authorCarlos R. Mafra <crmafra@gmail.com>
Tue, 18 Dec 2012 18:20:52 +0000 (18 18:20 +0000)
committerCarlos R. Mafra <crmafra@gmail.com>
Tue, 18 Dec 2012 18:20:52 +0000 (18 18:20 +0000)
This reverts commit 4e193c172b79a742b9b3e72403fc1e1d579f7aa5.

Conflicts:
src/window.c

src/client.c
src/placement.c
src/window.c

index ea72476..c11f306 100644 (file)
@@ -81,13 +81,6 @@ void wClientRestore(WWindow * wwin)
        if (gy > 0)
                wwin->frame_y += (wwin->frame->top_width + wwin->frame->bottom_width);
 #endif
-       /* account for titlebar and border */
-       wwin->frame_y += wwin->frame->top_width;
-       if (HAS_BORDER(wwin)) {
-               wwin->frame_x += FRAME_BORDER_WIDTH;
-               wwin->frame_y += FRAME_BORDER_WIDTH;
-       }
-
        XSetWindowBorderWidth(dpy, wwin->client_win, wwin->old_border_width);
        XReparentWindow(dpy, wwin->client_win, wwin->screen_ptr->root_win, wwin->frame_x, wwin->frame_y);
 
index 3d219d6..b30e0af 100644 (file)
@@ -523,7 +523,6 @@ void PlaceWindow(WWindow *wwin, int *x_ret, int *y_ret, unsigned width, unsigned
        WScreen *scr = wwin->screen_ptr;
        int h = WMFontHeight(scr->title_font)
                + (wPreferences.window_title_clearance + TITLEBAR_EXTEND_SPACE) * 2;
-       int border_width;
 
        if (h > wPreferences.window_title_max_height)
                h = wPreferences.window_title_max_height;
@@ -578,14 +577,13 @@ void PlaceWindow(WWindow *wwin, int *x_ret, int *y_ret, unsigned width, unsigned
         * this will also take dock/clip etc.. into account
         * aswell as being xinerama friendly
         */
-       border_width = (HAS_BORDER(wwin)) ? 2 * FRAME_BORDER_WIDTH : 0;
-       if (*x_ret + border_width + width > usableArea.x2)
-               *x_ret = usableArea.x2 - border_width - width;
+       if (*x_ret + width > usableArea.x2)
+               *x_ret = usableArea.x2 - width;
        if (*x_ret < usableArea.x1)
                *x_ret = usableArea.x1;
 
-       if (*y_ret + border_width + height > usableArea.y2)
-               *y_ret = usableArea.y2 - border_width - height;
+       if (*y_ret + height > usableArea.y2)
+               *y_ret = usableArea.y2 - height;
        if (*y_ret < usableArea.y1)
                *y_ret = usableArea.y1;
 }
index b794b2b..f0df269 100644 (file)
@@ -591,7 +591,6 @@ WWindow *wManageWindow(WScreen *scr, Window window)
        char *title;
        Bool withdraw = False;
        Bool raise = False;
-       Bool frame_adjustment = True;
 
        /* mutex. */
        XGrabServer(dpy);
@@ -992,7 +991,6 @@ WWindow *wManageWindow(WScreen *scr, Window window)
 
                        } else {
                                PlaceWindow(wwin, &x, &y, width, height);
-                               frame_adjustment = False;
                        }
 
                        if (wPreferences.window_placement == WPM_MANUAL)
@@ -1142,7 +1140,7 @@ WWindow *wManageWindow(WScreen *scr, Window window)
                        y -= wwin->frame->top_width + wwin->frame->bottom_width;
        }
 
-       if (frame_adjustment) {
+       {
                WMRect rect;
                WArea usableArea;
                int head;