From 48a24a2e08d5978e538e31c8480fa3d7b9b0b291 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@linux.intel.com>
Date: Thu, 19 Aug 2010 15:38:15 +0100
Subject: [PATCH] actor-box: Adds clutter_actor_box_union utility

When using ClutterActorBoxs for representing clip regions it can be
convenient to be able to union multiple boxes together.
---
 clutter/clutter-actor.c | 28 ++++++++++++++++++++++++++++
 clutter/clutter-types.h |  3 +++
 2 files changed, 31 insertions(+)

diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index fb32b16dc..580e6f469 100644
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -9331,6 +9331,34 @@ clutter_actor_box_clamp_to_pixel (ClutterActorBox *box)
   box->y2 = ceilf (box->y2);
 }
 
+/**
+ * clutter_actor_box_union:
+ * @a: (in): the first #ClutterActorBox
+ * @a: (in): a second #ClutterActorBox
+ * @result: (out): the #ClutterActorBox representing a union of @a and
+ *          @b
+ *
+ * Unions the two boxes @a and @b and stores the result in @result.
+ *
+ * Since: 1.4
+ */
+void
+clutter_actor_box_union (ClutterActorBox *a,
+                         ClutterActorBox *b,
+                         ClutterActorBox *result)
+{
+  g_return_if_fail (a != NULL);
+  g_return_if_fail (b != NULL);
+  g_return_if_fail (result != NULL);
+
+  result->x1 = MIN (a->x1, b->x1);
+  result->y1 = MIN (a->y1, b->y1);
+
+  result->x2 = MAX (a->x2, b->x2);
+  result->y2 = MAX (a->y2, b->y2);
+}
+
+
 /******************************************************************************/
 
 struct _ShaderData
diff --git a/clutter/clutter-types.h b/clutter/clutter-types.h
index cbe13d650..65a771f10 100644
--- a/clutter/clutter-types.h
+++ b/clutter/clutter-types.h
@@ -169,6 +169,9 @@ void             clutter_actor_box_interpolate   (const ClutterActorBox *initial
                                                   gdouble                progress,
                                                   ClutterActorBox       *result);
 void             clutter_actor_box_clamp_to_pixel (ClutterActorBox       *box);
+void             clutter_actor_box_union          (ClutterActorBox       *a,
+                                                   ClutterActorBox       *b,
+                                                   ClutterActorBox       *result);
 
 /**
  * ClutterGeometry: