summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Müllner <florian.muellner@gmail.com>2013-07-05 16:54:07 +0200
committerEmmanuele Bassi <ebassi@gnome.org>2013-08-19 23:37:38 +0100
commit5bab9a8655346290f7ee0e4af972e3d085a6b818 (patch)
tree7c58394bf50e491b071996f8c177328d420af946
parenta3b093d9c846c26793177d2d603b9eefef131cc1 (diff)
downloadclutter-5bab9a8655346290f7ee0e4af972e3d085a6b818.tar.gz
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
-rw-r--r--clutter/clutter-actor.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index d0b19388e..ab36000fe 100644
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -15398,16 +15398,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: