[maemo-commits] [maemo-commits] r19390 - projects/haf/trunk/clutter0.8/clutter

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-09-29 13:52:03 +0300 (Tue, 29 Sep 2009)
New Revision: 19390

Modified:
   projects/haf/trunk/clutter0.8/clutter/clutter-stage.c
Log:

  * clutter/clutter-stage.c (clutter_stage_paint): Move setting of the
    CLUTTER_ACTOR_IN_PAINT flag to after the shaped mode check.
    (redraw_update_idle): Do not draw onto the screen in shaped mode.
    Related to NB#134893


Modified: projects/haf/trunk/clutter0.8/clutter/clutter-stage.c
===================================================================
--- projects/haf/trunk/clutter0.8/clutter/clutter-stage.c	2009-09-28 13:11:56 UTC (rev 19389)
+++ projects/haf/trunk/clutter0.8/clutter/clutter-stage.c	2009-09-29 10:52:03 UTC (rev 19390)
@@ -271,11 +271,11 @@
   gboolean             update_area;
   guint                width, height;
 
-  CLUTTER_SET_PRIVATE_FLAGS (self, CLUTTER_ACTOR_IN_PAINT);
-
   if (priv->shaped_mode)
     return;
 
+  CLUTTER_SET_PRIVATE_FLAGS (self, CLUTTER_ACTOR_IN_PAINT);
+
   CLUTTER_NOTE (PAINT, "Initializing stage paint");
 
   last_damage = priv->last_damaged_area;
@@ -1954,6 +1954,10 @@
       priv->update_idle = 0;
     }
 
+  if (priv->shaped_mode)
+    /* Clutter drawing should not be done in 'shaped mode' */
+    return FALSE;
+
   CLUTTER_NOTE (MULTISTAGE, "redrawing via idle for stage:%p", stage);
   clutter_redraw (stage);