From: jpbruyere <jp.bruyere@hotmail.com>
Date: Thu, 20 Oct 2016 12:08:29 +0000 (+0200)
Subject: code clean and debug
X-Git-Tag: v0.9.5-beta~259^2~19
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=70fd8572cc2e46b5be496201a1090485b38a3bb8;p=jp%2Fcrow.git

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 94e92bf2..3630ea2f 100644
--- 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 de3891f2..8d6b4228 100644
--- 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)
 		{