[svn-upgrade] Integrating new upstream version, ion3 (20081002)

[ion3.git] / ioncore / group.c

diff --git a/ioncore/group.c b/ioncore/group.c
index 6d0409c1bd6e9862809f913beb086eab21fefd60..750c95595e050a3e6a3b99f9ffbf28e680269269 100644 (file)
--- a/ioncore/group.c
+++ b/ioncore/group.c
@@ -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'? */