Add rect to SP Control point on locked guides

(bzr r14500.1.13)

4 files changed, 28 insertions, 14 deletions

diff --git a/src/display/guideline.cpp b/src/display/guideline.cpp
index e1a115353..4b7ea59ab 100644
--- a/src/display/guideline.cpp
+++ b/src/display/guideline.cpp
@@ -179,9 +179,11 @@ static void sp_guideline_update(SPCanvasItem *item, Geom::Affine const &affine,
     gl->affine = affine;
 
     if (gl->locked) {
-      gl->origin->radius = 1;
+      sp_ctrlpoint_set_circle(gl->origin, false);
+      sp_ctrlpoint_set_lenght(gl->origin, 6);
     } else {
-      gl->origin->radius = 3;
+      sp_ctrlpoint_set_circle(gl->origin, true);
+      sp_ctrlpoint_set_lenght(gl->origin, 4);
     }
     sp_ctrlpoint_set_coords(gl->origin, gl->point_on_line);
     sp_canvas_item_request_update(SP_CANVAS_ITEM (gl->origin));
diff --git a/src/display/sp-ctrlpoint.cpp b/src/display/sp-ctrlpoint.cpp
index 1082cb1b3..19dbbc130 100644
--- a/src/display/sp-ctrlpoint.cpp
+++ b/src/display/sp-ctrlpoint.cpp
@@ -42,7 +42,8 @@ sp_ctrlpoint_init (SPCtrlPoint *ctrlpoint)
     ctrlpoint->rgba = 0x0000ff7f;
     ctrlpoint->pt[Geom::X] = ctrlpoint->pt[Geom::Y] = 0.0;
     ctrlpoint->item=NULL;
-    ctrlpoint->radius = 2;
+    ctrlpoint->lenght = 4;
+    ctrlpoint->is_circle = true;
 }
 
 static void sp_ctrlpoint_destroy(SPCanvasItem *object)
@@ -75,8 +76,11 @@ sp_ctrlpoint_render (SPCanvasItem *item, SPCanvasBuf *buf)
     cairo_new_path(buf->ct);
 
     Geom::Point pt = cp->pt * cp->affine;
-
-    cairo_arc(buf->ct, pt[Geom::X] - buf->rect.left(), pt[Geom::Y] - buf->rect.top(), cp->radius, 0.0, 2 * M_PI);
+    if( cp->is_circle ) {
+        cairo_arc(buf->ct, pt[Geom::X] - buf->rect.left(), pt[Geom::Y] - buf->rect.top(), cp->lenght/2.0, 0.0, 2 * M_PI);
+    } else {
+        cairo_rectangle(buf->ct, pt[Geom::X] - buf->rect.left() - cp->lenght/2.0, pt[Geom::Y] - buf->rect.top() - cp->lenght/2.0 , cp->lenght, cp->lenght);
+    }
     cairo_stroke(buf->ct);
 }
 
@@ -96,10 +100,10 @@ static void sp_ctrlpoint_update(SPCanvasItem *item, Geom::Affine const &affine,
 
     Geom::Point pt = cp->pt * affine;
 
-    item->x1 = pt[Geom::X] - cp->radius;
-    item->y1 = pt[Geom::Y] - cp->radius;
-    item->x2 = pt[Geom::X] + cp->radius;
-    item->y2 = pt[Geom::Y] + cp->radius;
+    item->x1 = pt[Geom::X] - cp->lenght;
+    item->y1 = pt[Geom::Y] - cp->lenght;
+    item->x2 = pt[Geom::X] + cp->lenght;
+    item->y2 = pt[Geom::Y] + cp->lenght;
 
     item->canvas->requestRedraw((int)item->x1 - 15, (int)item->y1 - 15,
                                 (int)item->x1 + 15, (int)item->y1 + 15);
@@ -142,9 +146,15 @@ sp_ctrlpoint_set_coords (SPCtrlPoint *cp, const Geom::Point pt)
 }
 
 void
-sp_ctrlpoint_set_radius (SPCtrlPoint *cp, const double r)
+sp_ctrlpoint_set_lenght (SPCtrlPoint *cp, const double r)
+{
+    cp->lenght = r;
+}
+
+void
+sp_ctrlpoint_set_circle (SPCtrlPoint *cp, const bool circle)
 {
-    cp->radius = r;
+    cp->is_circle = circle;
 }
 
 /*
diff --git a/src/display/sp-ctrlpoint.h b/src/display/sp-ctrlpoint.h
index a7a5475b7..02e61caf0 100644
--- a/src/display/sp-ctrlpoint.h
+++ b/src/display/sp-ctrlpoint.h
@@ -25,7 +25,8 @@ struct SPCtrlPoint : public SPCanvasItem {
     guint32 rgba;
     Geom::Point pt;
     Geom::Affine affine;
-    double radius;
+    double lenght;
+    bool is_circle;
 };
 struct SPCtrlPointClass : public SPCanvasItemClass{};
 
@@ -34,7 +35,8 @@ GType sp_ctrlpoint_get_type (void);
 void sp_ctrlpoint_set_color (SPCtrlPoint *cp, guint32 rgba);
 void sp_ctrlpoint_set_coords (SPCtrlPoint *cp, const gdouble x, const gdouble y);
 void sp_ctrlpoint_set_coords (SPCtrlPoint *cp, const Geom::Point pt);
-void sp_ctrlpoint_set_radius (SPCtrlPoint *cp, const double r);
+void sp_ctrlpoint_set_lenght (SPCtrlPoint *cp, const double r);
+void sp_ctrlpoint_set_circle (SPCtrlPoint *cp, const bool circle);
 
 
 
diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp
index 5a3c5a496..10190a6a7 100644
--- a/src/ui/control-manager.cpp
+++ b/src/ui/control-manager.cpp
@@ -298,7 +298,7 @@ void ControlManagerImpl::updateItem(SPCanvasItem *item)
         double target = _sizeTable[item->ctrlType][_size - 1];
 
         if ((item->ctrlType == CTRL_TYPE_ORIGIN) && SP_IS_CTRLPOINT(item)) {
-            sp_ctrlpoint_set_radius(SP_CTRLPOINT(item), target / 2.0);
+            sp_ctrlpoint_set_lenght(SP_CTRLPOINT(item), target );
         } else {
             if (_sizeChangers.count(item->ctrlType) && _manager.isSelected(item)) {
                 target += 2;