mirror of
https://github.com/ShareX/ShareX.git
synced 2024-06-30 20:20:34 +12:00
In color picker don't copy fields on double click
This commit is contained in:
parent
638aacf0b1
commit
e428ad0ebf
|
@ -308,22 +308,25 @@ public static bool ParseColor(string text, out Color color)
|
|||
{
|
||||
text = text.Trim();
|
||||
|
||||
Match matchHex = Regex.Match(text, @"^(?:#|0x)?((?:[0-9A-F]{2}){3})$", RegexOptions.IgnoreCase);
|
||||
|
||||
if (matchHex.Success)
|
||||
if (text.Length <= 20)
|
||||
{
|
||||
color = HexToColor(matchHex.Groups[1].Value);
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
Match matchRGB = Regex.Match(text, @"^(?:rgb\()?([1]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])(?:\s|,)+([1]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])(?:\s|,)+([1]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\)?$");
|
||||
Match matchHex = Regex.Match(text, @"^(?:#|0x)?((?:[0-9A-F]{2}){3})$", RegexOptions.IgnoreCase);
|
||||
|
||||
if (matchRGB.Success)
|
||||
if (matchHex.Success)
|
||||
{
|
||||
color = Color.FromArgb(int.Parse(matchRGB.Groups[1].Value), int.Parse(matchRGB.Groups[2].Value), int.Parse(matchRGB.Groups[3].Value));
|
||||
color = HexToColor(matchHex.Groups[1].Value);
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
Match matchRGB = Regex.Match(text, @"^(?:rgb\()?([1]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])(?:\s|,)+([1]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])(?:\s|,)+([1]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\)?$");
|
||||
|
||||
if (matchRGB.Success)
|
||||
{
|
||||
color = Color.FromArgb(int.Parse(matchRGB.Groups[1].Value), int.Parse(matchRGB.Groups[2].Value), int.Parse(matchRGB.Groups[3].Value));
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -47,14 +47,6 @@ public ScreenColorPicker(bool checkClipboard = false)
|
|||
|
||||
UpdateControls(false);
|
||||
|
||||
foreach (Control control in Controls)
|
||||
{
|
||||
if (control is NumericUpDown || control is TextBox)
|
||||
{
|
||||
control.DoubleClick += CopyToClipboard;
|
||||
}
|
||||
}
|
||||
|
||||
if (checkClipboard)
|
||||
{
|
||||
if (Clipboard.ContainsText())
|
||||
|
@ -69,25 +61,6 @@ public ScreenColorPicker(bool checkClipboard = false)
|
|||
}
|
||||
}
|
||||
|
||||
private void CopyToClipboard(object sender, EventArgs e)
|
||||
{
|
||||
string text = "";
|
||||
|
||||
if (sender is NumericUpDown)
|
||||
{
|
||||
text = ((NumericUpDown)sender).Value.ToString();
|
||||
}
|
||||
else if (sender is TextBox)
|
||||
{
|
||||
text = ((TextBox)sender).Text;
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(text))
|
||||
{
|
||||
ClipboardHelpers.CopyText(text);
|
||||
}
|
||||
}
|
||||
|
||||
private void UpdateColor(int x, int y)
|
||||
{
|
||||
UpdateColor(x, y, CaptureHelpers.GetPixelColor(x, y));
|
||||
|
|
Loading…
Reference in a new issue