Imported upstream version 20090526

[ion3.git] / ioncore / group.c

diff --git a/ioncore/group.c b/ioncore/group.c
index ad38ee8dd5a2a8129a7240236b4393519c015b84..7e4b1da713ccd4c33f45409d4fe4500c4d495c18 100644 (file)
--- 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.
  */
@@ -241,7 +241,7 @@ static void group_do_set_focus(WGroup *ws, bool warp)
     if(st!=NULL && st->reg!=NULL)
         region_do_set_focus(st->reg, warp);
     else
-        region_finalise_focusing((WRegion*)ws, ws->dummywin, warp);
+        region_finalise_focusing((WRegion*)ws, ws->dummywin, warp, CurrentTime);
 }
 
 
@@ -633,8 +633,8 @@ bool group_do_attach_final(WGroup *ws,
             ? param->szplcy
             : (param->bottom
                ? SIZEPOLICY_FULL_EXACT
-               : SIZEPOLICY_UNCONSTRAINED));
-        
+               : SIZEPOLICY_VISIBILITY_CONSTRAINED));
+    
     if(!param->whatever){
         weak=(param->geom_weak_set
               ? param->geom_weak
@@ -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'? */