[clutter/clutter-1.14] actor: Minor cleanup



commit 0632c424973dc12c03e5a3e9a0b7c89b2546fd66
Author: Florian Müllner <florian muellner gmail com>
Date:   Fri Jul 5 16:54:07 2013 +0200

    actor: Minor cleanup
    
    In clutter_allocate_align_fill(), x2/y2 may be set twice for no
    particular reason; save a couple of lines by not doing this.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=703809
    (cherry picked from commit 5bab9a8655346290f7ee0e4af972e3d085a6b818)
    Signed-off-by: Emmanuele Bassi <ebassi gnome org>

 clutter/clutter-actor.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index 0962cd4..bfb9711 100644
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -15336,16 +15336,10 @@ clutter_actor_allocate_align_fill (ClutterActor           *self,
     x_align = 1.0 - x_align;
 
   if (!x_fill)
-    {
-      allocation.x1 += ((available_width - child_width) * x_align);
-      allocation.x2 = allocation.x1 + child_width;
-    }
+    allocation.x1 += ((available_width - child_width) * x_align);
 
   if (!y_fill)
-    {
-      allocation.y1 += ((available_height - child_height) * y_align);
-      allocation.y2 = allocation.y1 + child_height;
-    }
+    allocation.y1 += ((available_height - child_height) * y_align);
 
 out:
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]