Imported Upstream version 20090110

[ion3.git] / ioncore / grouppholder.c

diff --git a/ioncore/grouppholder.c b/ioncore/grouppholder.c
index cdd2dce546b35b144132d83adc1340f63750e7ba..052f67725941761d643e4f2d1a286054146f607c 100644 (file)
--- a/ioncore/grouppholder.c
+++ b/ioncore/grouppholder.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/grouppholder.c
  *
- * Copyright (c) Tuomo Valkonen 2005-2008. 
+ * Copyright (c) Tuomo Valkonen 2005-2009. 
  *
  * See the included file LICENSE for details.
  */
@@ -197,9 +197,13 @@ static WRegion *recreate_handler(WWindow *par,
     
     if(grp==NULL)
         return NULL;
+        
+    rp->ph->param.whatever=(fp->mode&REGION_FIT_WHATEVER ? 1 : 0);
     
     rp->reg_ret=group_do_attach(grp, &rp->ph->param, rp->data);
     
+    rp->ph->param.whatever=0;
+    
     if(rp->reg_ret==NULL){
         destroy_obj((Obj*)grp);
         return NULL;
@@ -210,6 +214,9 @@ static WRegion *recreate_handler(WWindow *par,
             phtmp->group=grp;
     }
     
+    if(fp->mode&REGION_FIT_WHATEVER)
+        REGION_GEOM(grp)=REGION_GEOM(rp->reg_ret);
+    
     return (WRegion*)grp;
 }
 
@@ -220,7 +227,7 @@ static WRegion *grouppholder_attach_recreate(WGroupPHolder *ph, int flags,
 {
     WRegionAttachData data2;
     WPHolder *root, *rph;
-    WGroup *grp;
+    WRegion *res;
     RP rp;
     
     rp.ph_head=get_head(ph);
@@ -240,16 +247,17 @@ static WRegion *grouppholder_attach_recreate(WGroupPHolder *ph, int flags,
     data2.u.n.fn=recreate_handler;
     data2.u.n.param=&rp;
     
-    grp=(WGroup*)pholder_do_attach(rph, flags, &data2);
+    res=pholder_do_attach(rph, flags, &data2);
     
-    if(grp!=NULL){
-        assert(OBJ_IS(grp, WGroup));
+    if(res!=NULL){
         rp.ph_head->recreate_pholder=NULL;
         /* It might be in use in attach chain! So defer. */
         mainloop_defer_destroy((Obj*)rph);
     }
 
-    return rp.reg_ret;
+    return (flags&PHOLDER_ATTACH_RETURN_CREATEROOT
+            ? (WRegion*)res
+            : rp.reg_ret);
 }