place: Move maximization path above first fit finding

This commit is contained in:
Jasper St. Pierre 2014-05-20 15:38:07 -04:00
parent 809568280b
commit ae4e553ddb

View File

@ -803,15 +803,6 @@ meta_window_place (MetaWindow *window,
/* Warning, this is a round trip! */ /* Warning, this is a round trip! */
xi = meta_screen_get_current_monitor_info (window->screen); xi = meta_screen_get_current_monitor_info (window->screen);
/* "Origin" placement algorithm */
x = xi->rect.x;
y = xi->rect.y;
if (find_first_fit (window, windows,
xi->number,
x, y, &x, &y))
goto done_check_denied_focus;
/* Maximize windows if they are too big for their work area (bit of /* Maximize windows if they are too big for their work area (bit of
* a hack here). Assume undecorated windows probably don't intend to * a hack here). Assume undecorated windows probably don't intend to
* be maximized. * be maximized.
@ -837,6 +828,15 @@ meta_window_place (MetaWindow *window,
} }
} }
/* "Origin" placement algorithm */
x = xi->rect.x;
y = xi->rect.y;
if (find_first_fit (window, windows,
xi->number,
x, y, &x, &y))
goto done_check_denied_focus;
/* If no placement has been done, revert to cascade to avoid /* If no placement has been done, revert to cascade to avoid
* fully overlapping window (e.g. starting multiple terminals) * fully overlapping window (e.g. starting multiple terminals)
* */ * */