Back to original colors

(bzr r11950.1.99)

3 files changed, 12 insertions, 23 deletions

diff --git a/src/pen-context.cpp b/src/pen-context.cpp
index 181579fa2..7fb99e32e 100644
--- a/src/pen-context.cpp
+++ b/src/pen-context.cpp
@@ -1462,34 +1462,23 @@ static void bspline_spiro_color(SPPenContext *const pc)
         if(pc->green_color != 0x00ff000){
             //We change the green and red colours to transparent, so this lines are not necessary
             //to the drawing with spiro
-            pc->red_color = 0x00ff000;
+            pc->red_color = 0xff00000;
             pc->green_color = 0x00ff000;
-            pc->blue_color = 0x23abcdff;
             remake_green_bpaths = true;
         }
-    }else if(pc->bspline){
+    }else{
         //If we come from working with the spiro curve and change the mode the "green_curve" colour is transparent
-        if(pc->green_color != 0xe68024ff){
+        if(pc->green_color != 0x00ff007f){
             //since we are not im spiro mode, we assign the original colours
             //to the red and the green curve, removing their transparency 
-            pc->red_color = 0xe68024ff;
-            pc->green_color = 0xe68024ff;
-            pc->blue_color = 0x23abcdff;
+            pc->red_color = 0xff00007f;
+            pc->green_color = 0x00ff007f;
             remake_green_bpaths = true;
         }
         //we hide the spiro/bspline rests
-    }else{
-        if(pc->green_color != 0xf372ebff){
-            //since we are not im spiro mode, we assign the original colours
-            //to the red and the green curve, removing their transparency 
-            pc->red_color = 0xe68024ff;
-            pc->green_color = 0xf372ebff;
-            pc->blue_color = 0x23abcdff;
-            remake_green_bpaths = true;
+        if(!pc->bspline){
+            sp_canvas_item_hide(pc->blue_bpath);
         }
-    }    
-    if(!pc->bspline){
-        sp_canvas_item_hide(pc->blue_bpath);
     }
     //We erase all the "green_bpaths" to recreate them after with the colour
     //transparency recently modified
diff --git a/src/sp-guide.cpp b/src/sp-guide.cpp
index 3266d8819..48596cbc0 100644
--- a/src/sp-guide.cpp
+++ b/src/sp-guide.cpp
@@ -95,8 +95,8 @@ static void sp_guide_init(SPGuide *guide)
 {
     guide->normal_to_line = Geom::Point(0.,1.);
     guide->point_on_line = Geom::Point(0.,0.);
-    guide->color = 0x23abcd7f;
-    guide->hicolor = 0xf372eb7f;
+    guide->color = 0x0000ff7f;
+    guide->hicolor = 0xff00007f;
 }
 
 static void sp_guide_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec */*pspec*/)
diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp
index 9425bc3f0..5a3c5a496 100644
--- a/src/ui/control-manager.cpp
+++ b/src/ui/control-manager.cpp
@@ -59,9 +59,9 @@ ControlFlags& operator ^=(ControlFlags &lhs, ControlFlags rhs)
 #define FILL_COLOR_MOUSEOVER 0xff0000ff
 
 // Default color for line:
-#define LINE_COLOR_PRIMARY 0x23abcdff
-#define LINE_COLOR_SECONDARY 0xf372ebff
-#define LINE_COLOR_TERTIARY 0xe68024ff
+#define LINE_COLOR_PRIMARY 0x0000ff7f
+#define LINE_COLOR_SECONDARY 0xff00007f
+#define LINE_COLOR_TERTIARY 0xffff007f
 
 namespace Inkscape {