code clean and debug

	modifié :         src/GraphicObjects/ColorSelector.cs
	modifié :         src/GraphicObjects/SaturationValueSelector.cs

diff --git a/src/GraphicObjects/ColorSelector.cs b/src/GraphicObjects/ColorSelector.cs
index 94e92bf2ae4b290bb9bfab1e78b24d0ba3ce1d1d..3630ea2f51a6d0d052b1635df54ac94ae10e221a 100644 (file)
--- a/src/GraphicObjects/ColorSelector.cs
+++ b/src/GraphicObjects/ColorSelector.cs
@@ -118,21 +118,7 @@ namespace Crow
                                computeColorFromHSV ();
                        }
                }
-//             [XmlAttributeAttribute()][DefaultValue("White")]
-//             public virtual Fill PointedColor {
-//                     get { return pointedColor; }
-//                     set {
-//                             if (pointedColor == value)
-//                                     return;
-//                             pointedColor = value; 
-//                             NotifyValueChanged ("PointedColor", pointedColor);
-//                             string n = (pointedColor as SolidColor).color.ToString ();
-//                             if (char.IsLetter(n[0]))
-//                                     NotifyValueChanged ("PointedColorName", n);
-//                             else
-//                                     NotifyValueChanged ("PointedColorName", "-");
-//                     }
-//             }
+
                [XmlAttributeAttribute()][DefaultValue("White")]
                public virtual Fill SelectedColor {
                        get { return selectedColor; }
@@ -155,7 +141,7 @@ namespace Crow
                        if (bmp == null || CurrentInterface.Mouse.LeftButton == ButtonState.Released)
                                return;
                        updateMouseLocalPos (e.Position);
-                       updateColor ();
+                       updateColorFromPicking ();
                }
 
                public override void onMouseClick (object sender, MouseButtonEventArgs e)
@@ -163,7 +149,7 @@ namespace Crow
                        base.onMouseClick (sender, e);
 
                        updateMouseLocalPos (e.Position);
-                       updateColor ();
+                       updateColorFromPicking ();
                }
                void updateMouseLocalPos(Point mPos){
                        Rectangle r = ScreenCoordinates (Slot);
@@ -175,7 +161,7 @@ namespace Crow
                        mousePos.Y = Math.Max(cb.Y, mousePos.Y);
                        mousePos.Y = Math.Min(cb.Bottom-1, mousePos.Y);
                }
-               virtual protected void updateColor(bool redraw = true){
+               virtual protected void updateColorFromPicking(bool redraw = true){
                        SelectedColor = new SolidColor(getPixelAt(mousePos.X, mousePos.Y));
 
                        updateHSV ();

diff --git a/src/GraphicObjects/SaturationValueSelector.cs b/src/GraphicObjects/SaturationValueSelector.cs
index de3891f2109d2e448b2f5ec55860cfda8e9deb96..8d6b4228aa7ba228dd5cec2ebe0d194fda6f3296 100644 (file)
--- a/src/GraphicObjects/SaturationValueSelector.cs
+++ b/src/GraphicObjects/SaturationValueSelector.cs
@@ -54,7 +54,7 @@ namespace Crow
                        CairoHelpers.CairoRectangle (gr, r, CornerRadius);
                        gr.Fill();
 
-                       updateColor (false);
+                       updateColorFromPicking (false);
                }
                public override void Paint (ref Context ctx)
                {