[maemo-commits] [maemo-commits] r17529 - in projects/haf/trunk/libmatchbox2: . matchbox/comp-mgr

[From: subversion at stage.maemo.org]

Author: aendrodi
Date: 2009-02-27 13:57:27 +0200 (Fri, 27 Feb 2009)
New Revision: 17529

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
Log:
	NB#103417 Animation actors cannot be resized
	Patch from Artem Egorkine.

	* matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c:
	  Set the size (but not the position) of
	  MBWMCompMgrClutterClientDontPosition clients
	  when they are reconfigured.


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-02-27 11:09:54 UTC (rev 17528)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-02-27 11:57:27 UTC (rev 17529)
@@ -1,3 +1,13 @@
+2009-02-10  Adam Endrodi  <adam.endrodi at blumsoft.eu>
+
+	NB#103417 Animation actors cannot be resized
+	Patch from Artem Egorkine.
+
+	* matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c:
+	  Set the size (but not the position) of
+	  MBWMCompMgrClutterClientDontPosition clients
+	  when they are reconfigured.
+
 2009-02-25  Jan Arne Petersen  <jpetersen at openismus.com>
 
 	* matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c

Modified: projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c	2009-02-27 11:09:54 UTC (rev 17528)
+++ projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c	2009-02-27 11:57:27 UTC (rev 17529)
@@ -181,8 +181,8 @@
   if (!(cclient->priv->flags & MBWMCompMgrClutterClientDontPosition))
     {
       clutter_actor_set_position (cclient->priv->actor, geom.x, geom.y);
-      clutter_actor_set_size (cclient->priv->texture, geom.width, geom.height);
     }
+  clutter_actor_set_size (cclient->priv->texture, geom.width, geom.height);
 
   /* this will also cause updating the corresponding pixmap
    * and ensures window<->pixmap binding */
@@ -708,10 +708,6 @@
       mb_wm_comp_mgr_clutter_fetch_texture (client);
     }
 
-  /* Don't touch clients that handle their own actor positioning */
-  if (cclient->priv->flags & MBWMCompMgrClutterClientDontPosition)
-      return;
-
   /* Detect if the X size or position is different to our size and position
    * and re-adjust */
   if (cclient->priv->actor && cclient->priv->texture)
@@ -727,7 +723,10 @@
           geom.width != width ||
           geom.height != height)
         {
-          clutter_actor_set_position(cclient->priv->actor, geom.x, geom.y);
+          if (!(cclient->priv->flags & MBWMCompMgrClutterClientDontPosition))
+	    {
+              clutter_actor_set_position(cclient->priv->actor, geom.x, geom.y);
+	    }
           clutter_actor_set_size(cclient->priv->texture,
                             geom.width, geom.height);
           /*