merge

flyher · May 1, 2017 · eec6be3 · eec6be3
2 parents 5f2c6a6 + 16f8c27
commit eec6be3
Show file tree

Hide file tree

Showing 15 changed files with 795 additions and 213 deletions.
diff --git a/ColorPicker/Main.Designer.cs b/ColorPicker/Main.Designer.cs
diff --git a/ColorPicker/Main.cs b/ColorPicker/Main.cs
@@ -14,6 +14,7 @@ public partial class Main : Form
         /// <summary>
         /// build:2014-02-27
         /// update:2014-04-16
+        /// update:2016-03-10
         /// </summary>
         public Main()
         {
@@ -29,6 +30,21 @@ private void txtColor_MouseDoubleClick(object sender, MouseEventArgs e)
             Clipboard.SetDataObject(txtColor.Text.Trim());
         }
 
+        private void txtR_DoubleClick(object sender, EventArgs e)
+        {
+            Clipboard.SetDataObject(txtR.Text.Trim());
+        }
+
+        private void txtG_DoubleClick(object sender, EventArgs e)
+        {
+            Clipboard.SetDataObject(txtG.Text.Trim());
+        }
+
+        private void txtB_DoubleClick(object sender, EventArgs e)
+        {
+            Clipboard.SetDataObject(txtB.Text.Trim());
+        }
+
         private void btnStart_Click(object sender, EventArgs e)
         {
             timer1.Enabled = true;
@@ -65,8 +81,12 @@ private void timer1_Tick(object sender, EventArgs e)
                 color = item.Value;
             }
             pbColor.BackColor = c;
-            //txtColor.Text = color.ToUpper();
             txtColor.Text = color;
+
+            txtR.Text = c.R.ToString();
+            txtG.Text = c.G.ToString();
+            txtB.Text = c.B.ToString();
+
         }
         #region 内部方法
         /*屏幕取色*/
@@ -104,6 +124,7 @@ private static Color GetScrPixel(Point pt)
                 return bmp.GetPixel(pt.X, pt.Y);
             }
         }
+
         #endregion
 
 

diff --git a/ColorPicker/bin/Debug/ColorPicker.exe b/ColorPicker/bin/Debug/ColorPicker.exe
diff --git a/ColorPicker/bin/Debug/ColorPicker.pdb b/ColorPicker/bin/Debug/ColorPicker.pdb
diff --git a/ColorPicker/bin/Debug/ColorPicker.vshost.exe b/ColorPicker/bin/Debug/ColorPicker.vshost.exe
diff --git a/ColorPicker/obj/x86/Debug/ColorPicker.csproj.FileListAbsolute.txt b/ColorPicker/obj/x86/Debug/ColorPicker.csproj.FileListAbsolute.txt
@@ -14,3 +14,10 @@ E:\git\ColorPicker\ColorPicker\obj\x86\Debug\ColorPicker.Properties.Resources.re
 E:\git\ColorPicker\ColorPicker\obj\x86\Debug\GenerateResource.read.1.tlog
 E:\git\ColorPicker\ColorPicker\obj\x86\Debug\GenerateResource.write.1.tlog
 E:\git\ColorPicker\ColorPicker\bin\Debug\ColorPicker.pdb
+E:\Work\git\ColorPicker\ColorPicker\obj\x86\Debug\ColorPicker.exe
+E:\Work\git\ColorPicker\ColorPicker\obj\x86\Debug\ColorPicker.pdb
+E:\Work\git\ColorPicker\ColorPicker\bin\Debug\ColorPicker.exe
+E:\Work\git\ColorPicker\ColorPicker\bin\Debug\ColorPicker.pdb
+E:\Work\git\ColorPicker\ColorPicker\obj\x86\Debug\ColorPicker.Main.resources
+E:\Work\git\ColorPicker\ColorPicker\obj\x86\Debug\ColorPicker.Properties.Resources.resources
+E:\Work\git\ColorPicker\ColorPicker\obj\x86\Debug\ColorPicker.csproj.GenerateResource.Cache
diff --git a/ColorPicker/obj/x86/Debug/ColorPicker.csproj.GenerateResource.Cache b/ColorPicker/obj/x86/Debug/ColorPicker.csproj.GenerateResource.Cache
diff --git a/ColorPicker/obj/x86/Debug/ColorPicker.exe b/ColorPicker/obj/x86/Debug/ColorPicker.exe
diff --git a/ColorPicker/obj/x86/Debug/ColorPicker.pdb b/ColorPicker/obj/x86/Debug/ColorPicker.pdb
diff --git a/ColorPicker/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/ColorPicker/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
diff --git a/ColorPicker/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/ColorPicker/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache