Added no highlight and cross icon on locked guides

(bzr r14500.1.4)

3 files changed, 6 insertions, 1 deletions

diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp
index b685dacbf..42e7c2fb6 100644
--- a/src/desktop-events.cpp
+++ b/src/desktop-events.cpp
@@ -531,6 +531,9 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data)
             } else {
                 GdkCursor *guide_cursor;
                 guide_cursor = gdk_cursor_new (GDK_HAND1);
+                if(guide->getLocked()){
+                    guide_cursor = gdk_cursor_new (GDK_X_CURSOR);
+                }
                 gdk_window_set_cursor(gtk_widget_get_window (GTK_WIDGET(desktop->getCanvas())), guide_cursor);
 #if GTK_CHECK_VERSION(3,0,0)
                 g_object_unref(guide_cursor);
diff --git a/src/display/guideline.cpp b/src/display/guideline.cpp
index 0a564f550..24353c681 100644
--- a/src/display/guideline.cpp
+++ b/src/display/guideline.cpp
@@ -18,6 +18,7 @@
 #include <2geom/transforms.h>
 #include "sp-canvas-util.h"
 #include "sp-ctrlpoint.h"
+#include "sp-ctrlquadr.h"
 #include "guideline.h"
 #include "display/cairo-utils.h"
 
@@ -180,7 +181,7 @@ static void sp_guideline_update(SPCanvasItem *item, Geom::Affine const &affine,
 
     sp_ctrlpoint_set_coords(gl->origin, gl->point_on_line);
     sp_canvas_item_request_update(SP_CANVAS_ITEM (gl->origin));
-
+    
     Geom::Point pol_transformed = gl->point_on_line*affine;
     if (gl->is_horizontal()) {
         sp_canvas_update_bbox (item, -1000000, round(pol_transformed[Geom::Y] - 16), 1000000, round(pol_transformed[Geom::Y] + 1));
diff --git a/src/sp-guide.cpp b/src/sp-guide.cpp
index fd07f76ef..e37f0b470 100644
--- a/src/sp-guide.cpp
+++ b/src/sp-guide.cpp
@@ -118,6 +118,7 @@ void SPGuide::set(unsigned int key, const gchar *value) {
         break;
     case SP_ATTR_INKSCAPE_LOCKED:
         this->locked = helperfns_read_bool(value, false);
+        this->hicolor = this->color;
         if (value) {
             this->set_locked(this->locked, false);
         }