[maemo-commits] [maemo-commits] r19418 - in projects/haf/trunk/clutter0.8: clutter debian

[From: subversion at stage.maemo.org]

Author: gw
Date: 2009-10-07 13:26:07 +0300 (Wed, 07 Oct 2009)
New Revision: 19418

Modified:
   projects/haf/trunk/clutter0.8/clutter/clutter-actor.c
   projects/haf/trunk/clutter0.8/clutter/clutter-stage.c
   projects/haf/trunk/clutter0.8/debian/changelog
Log:
clutter (0.8.2-0maemo52) unstable; urgency=low

  Gordon:
  Small bugfix allowing us to stop redraws for screen blanking while not
  conflicting with what we do for rotation.
  * clutter/clutter-actor.c: clutter_actor_get_stage_if_allow_redraw now
    checks the allow_redraw flag on the stage.
  * clutter/clutter-stage.c: Removed shaped_mode return in paint, as it is too
    late if we ever get to this point (screen has been cleared + will be
    flipped)

 -- Gordon Williams <gordon.williams at collabora.co.uk>  Wed,  7 Oct 2009 11:24:14 +0100


Modified: projects/haf/trunk/clutter0.8/clutter/clutter-actor.c
===================================================================
--- projects/haf/trunk/clutter0.8/clutter/clutter-actor.c	2009-10-07 06:19:18 UTC (rev 19417)
+++ projects/haf/trunk/clutter0.8/clutter/clutter-actor.c	2009-10-07 10:26:07 UTC (rev 19418)
@@ -7520,6 +7520,9 @@
         return NULL;
       actor = clutter_actor_get_parent (actor);
     }
+  /* Check the stage itself for the allow_redraw flag */
+  if (actor && !CLUTTER_ACTOR_GET_PRIVATE(actor)->allow_redraw)
+    return NULL;
 
   return actor;
 }

Modified: projects/haf/trunk/clutter0.8/clutter/clutter-stage.c
===================================================================
--- projects/haf/trunk/clutter0.8/clutter/clutter-stage.c	2009-10-07 06:19:18 UTC (rev 19417)
+++ projects/haf/trunk/clutter0.8/clutter/clutter-stage.c	2009-10-07 10:26:07 UTC (rev 19418)
@@ -271,9 +271,6 @@
   gboolean             update_area;
   guint                width, height;
 
-  if (priv->shaped_mode)
-    return;
-
   CLUTTER_SET_PRIVATE_FLAGS (self, CLUTTER_ACTOR_IN_PAINT);
 
   CLUTTER_NOTE (PAINT, "Initializing stage paint");

Modified: projects/haf/trunk/clutter0.8/debian/changelog
===================================================================
--- projects/haf/trunk/clutter0.8/debian/changelog	2009-10-07 06:19:18 UTC (rev 19417)
+++ projects/haf/trunk/clutter0.8/debian/changelog	2009-10-07 10:26:07 UTC (rev 19418)
@@ -1,8 +1,15 @@
-clutter (0.8.2-0maemo52~unreleased) unstable; urgency=low
+clutter (0.8.2-0maemo52) unstable; urgency=low
 
-  * foo
+  Gordon:
+  Small bugfix allowing us to stop redraws for screen blanking while not
+  conflicting with what we do for rotation.
+  * clutter/clutter-actor.c: clutter_actor_get_stage_if_allow_redraw now
+    checks the allow_redraw flag on the stage.
+  * clutter/clutter-stage.c: Removed shaped_mode return in paint, as it is too
+    late if we ever get to this point (screen has been cleared + will be
+    flipped)
 
- -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Tue,  6 Oct 2009 09:01:27 +0300
+ -- Gordon Williams <gordon.williams at collabora.co.uk>  Wed,  7 Oct 2009 11:24:14 +0100
 
 clutter (0.8.2-0maemo51) unstable; urgency=low