[dia] uml: fix component main point position and autogap calculation

[Hans Breuer <hans src gnome org>]

commit e4332279c7bef07d2bf0e4fd1cfec7a9324d0d89
Author: Hans Breuer <hans breuer org>
Date:   Wed Oct 5 23:20:30 2011 +0200

    uml: fix component main point position and autogap calculation
    
    distance_from() calculation with all three rectangles, main point
    in the center of the large rectangle.

 objects/UML/component.c |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/objects/UML/component.c b/objects/UML/component.c
index b3cf58f..e117666 100644
--- a/objects/UML/component.c
+++ b/objects/UML/component.c
@@ -175,8 +175,18 @@ component_set_props(Component *component, GPtrArray *props)
 static real
 component_distance_from(Component *cmp, Point *point)
 {
-  DiaObject *obj = &cmp->element.object;
-  return distance_rectangle_point(&obj->bounding_box, point);
+  Element *elem = &cmp->element;
+  real x = elem->corner.x;
+  real y = elem->corner.y;
+  real cw2 = COMPONENT_CWIDTH/2.0;
+  real h2 = elem->height / 2.0;
+  Rectangle r1 = { x + cw2, y, x + elem->width - cw2, y + elem->height };
+  Rectangle r2 = { x, y + h2 - COMPONENT_CHEIGHT * 1.5, x + cw2, y + h2 - COMPONENT_CHEIGHT * 0.5 };
+  Rectangle r3 = { x, y + h2 + COMPONENT_CHEIGHT * 0.5, x + cw2, y + h2 + COMPONENT_CHEIGHT * 1.5 };
+  real d1 = distance_rectangle_point(&r1, point);
+  real d2 = distance_rectangle_point(&r2, point);
+  real d3 = distance_rectangle_point(&r3, point);
+  return MIN(d1, MIN(d2, d3));
 }
 
 static void
@@ -362,8 +372,8 @@ component_update_data(Component *cmp)
 		   elem->corner.y + elem->height / 2.0 + ch,
 		   DIR_WEST);
   connpoint_update(&cmp->connections[10],
-		   elem->corner.x + (elem->width-cw2)/2,
-		   elem->corner.y + elem->height / 2.0 + ch,
+		   elem->corner.x + cw2 + (elem->width - cw2) / 2,
+		   elem->corner.y + elem->height / 2.0,
 		   DIR_ALL);
 
   element_update_boundingbox(elem);