X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fdock.c;h=934d3d03bcd8072390b4bb587a2c153df06b5ad4;hb=795d90c3bc57eaf2c98c447f3af5c1c9e7a52fa3;hp=eee578c5ca662fd79f0ca6feefdcbe63bd9fe80d;hpb=135d6d7bdc5add79aabcdfca2cbfb290d5591341;p=chaz%2Fopenbox diff --git a/openbox/dock.c b/openbox/dock.c index eee578c5..934d3d03 100644 --- a/openbox/dock.c +++ b/openbox/dock.c @@ -152,19 +152,28 @@ void dock_configure() dock->w = dock->h = spot = 0; + /* get the size */ for (it = dock->dock_apps; it; it = it->next) { struct DockApp *app = it->data; if (config_dock_horz) { - app->x = spot; - app->y = (dock->h - app->h) / 2; dock->w += app->w; dock->h = MAX(dock->h, app->h); + } else { + dock->w = MAX(dock->w, app->w); + dock->h += app->h; + } + } + + /* position the apps */ + for (it = dock->dock_apps; it; it = it->next) { + struct DockApp *app = it->data; + if (config_dock_horz) { + app->x = spot; + app->y = (dock->h - app->h) / 2; spot += app->w; } else { app->x = (dock->w - app->w) / 2; app->y = spot; - dock->w = MAX(dock->w, app->w); - dock->h += app->h; spot += app->h; }