2007-07-11 Emmanuele Bassi <ebassi@openedhand.com>

	* clutter/clutter-behaviour-opacity.c:
	Don't check direction in opacity.

diff --git a/ChangeLog b/ChangeLog
index 6904201..6f9d99a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-11  Emmanuele Bassi  <ebassi@openedhand.com>
+
+       * clutter/clutter-behaviour-opacity.c:
+       Don't check direction in opacity.
+
 2007-07-11  Tomas Frydrych  <tf@openedhand.com>
 
        * clutter/clutter-fixed.h:

diff --git a/clutter/clutter-behaviour-opacity.c b/clutter/clutter-behaviour-opacity.c
index 97beae4..934c18d 100644 (file)
--- a/clutter/clutter-behaviour-opacity.c
+++ b/clutter/clutter-behaviour-opacity.c
@@ -95,14 +95,10 @@ clutter_behaviour_alpha_notify (ClutterBehaviour *behave,
 
   priv = CLUTTER_BEHAVIOUR_OPACITY (behave)->priv;
 
-  if (priv->opacity_end > priv->opacity_start)
-    delta = priv->opacity_end - priv->opacity_start;
-  else
-    delta = priv->opacity_start - priv->opacity_end;
+  delta = priv->opacity_end - priv->opacity_start;
 
   opacity = alpha_value * delta / CLUTTER_ALPHA_MAX_ALPHA;
-  opacity += ((priv->opacity_end > priv->opacity_start) ? priv->opacity_start
-                                                        : priv->opacity_end);
+  opacity += priv->opacity_start; 
 
   CLUTTER_NOTE (BEHAVIOUR, "alpha: %i, opacity: %i", alpha_value, opacity);