X-Git-Url: https://git.decadent.org.uk/gitweb/?p=ion3.git;a=blobdiff_plain;f=ioncore%2Fgroup.c;h=3db079526e8ece8bbcb89b258207e12cd4bb7227;hp=6d0409c1bd6e9862809f913beb086eab21fefd60;hb=HEAD;hpb=e994f4613fd17422f00170760eefb47427b86660 diff --git a/ioncore/group.c b/ioncore/group.c index 6d0409c..3db0795 100644 --- a/ioncore/group.c +++ b/ioncore/group.c @@ -1,7 +1,7 @@ /* * ion/ioncore/group.c * - * Copyright (c) Tuomo Valkonen 1999-2008. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ @@ -628,14 +628,14 @@ bool group_do_attach_final(WGroup *ws, ? param->level : STACKING_LEVEL_NORMAL)); + /* Fit */ + szplcy=(param->szplcy_set + ? param->szplcy + : (param->bottom + ? SIZEPOLICY_FULL_EXACT + : SIZEPOLICY_VISIBILITY_CONSTRAINED)); + if(!param->whatever){ - /* Fit */ - szplcy=(param->szplcy_set - ? param->szplcy - : (param->bottom - ? SIZEPOLICY_FULL_EXACT - : SIZEPOLICY_UNCONSTRAINED)); - weak=(param->geom_weak_set ? param->geom_weak : (param->geom_set @@ -662,6 +662,7 @@ bool group_do_attach_final(WGroup *ws, if(weak&(REGION_RQGEOM_WEAK_X|REGION_RQGEOM_WEAK_Y) && (szplcy==SIZEPOLICY_UNCONSTRAINED || + szplcy==SIZEPOLICY_VISIBILITY_CONSTRAINED || szplcy==SIZEPOLICY_FREE || szplcy==SIZEPOLICY_FREE_GLUE /* without flags */)){ /* TODO: use 'weak'? */