CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-07-04 22:21:23 +12:00
Code Issues Packages Projects Releases Wiki Activity

fixed #3938: Double clicking recent color box will close color picker dialog

Browse source
This commit is contained in:
Jaex 2019-02-08 16:20:35 +03:00
parent a110f8d582
commit 44a1234c59
1 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
ShareX.HelpersLib/Colors/ColorPickerForm.cs
View file

@ -85,6 +85,8 @@ private void PrepareRecentColors()
{ {
int length = Math.Min(HelpersOptions.RecentColors.Count, HelpersOptions.RecentColorsMax); int length = Math.Min(HelpersOptions.RecentColors.Count, HelpersOptions.RecentColorsMax);
Color previousColor = Color.Empty;
for (int i = 0; i < length; i++) for (int i = 0; i < length; i++)
{ {
ColorButton colorButton = new ColorButton() ColorButton colorButton = new ColorButton()
@ -98,7 +100,25 @@ private void PrepareRecentColors()
ManualButtonClick = true ManualButtonClick = true
}; };
colorButton.Click += (sender, e) => SetCurrentColor(colorButton.Color, true); colorButton.MouseClick += (sender, e) =>
{
if (e.Button == MouseButtons.Left)
{
SetCurrentColor(colorButton.Color, true);
if (!IsScreenColorPickerMode)
{
if (!previousColor.IsEmpty && previousColor == colorButton.Color)
{
CloseOK();
}
else
{
previousColor = colorButton.Color;
}
}
}
};
flpRecentColors.Controls.Add(colorButton); flpRecentColors.Controls.Add(colorButton);
if ((i + 1) % 16 == 0) flpRecentColors.SetFlowBreak(colorButton, true); if ((i + 1) % 16 == 0) flpRecentColors.SetFlowBreak(colorButton, true);
@ -210,6 +230,13 @@ private void DrawPreviewColors()
} }
} }
private void CloseOK()
{
AddRecentColor(NewColor);
DialogResult = DialogResult.OK;
Close();
}
#region Events #region Events
private void ColorPickerForm_Shown(object sender, EventArgs e) private void ColorPickerForm_Shown(object sender, EventArgs e)
@ -225,9 +252,7 @@ private void colorPicker_ColorChanged(object sender, ColorEventArgs e)
private void btnOK_Click(object sender, EventArgs e) private void btnOK_Click(object sender, EventArgs e)
{ {
AddRecentColor(NewColor); CloseOK();
DialogResult = DialogResult.OK;
Close();
} }
private void btnCancel_Click(object sender, EventArgs e) private void btnCancel_Click(object sender, EventArgs e)