github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-14 10:47:02 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

FEATURE-1196 (#339)

Browse source 
* FEATURE-1196: Double clicking on the colour square chooses the color and closes the color window
* BUG-2565: Tooltip on recent colors is not representing the color.
This commit is contained in:
Eric Cogen 2021-10-13 02:18:13 -04:00 • committed by GitHub
commit e06c3e8510
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Greenshot.Base/Controls/GreenshotDoubleClickButton.cs Normal file
View file

@ -0,0 +1,12 @@
using System.Windows.Forms;
namespace Greenshot.Base.Controls
{
public class GreenshotDoubleClickButton : Button
{
public GreenshotDoubleClickButton()
{
SetStyle(ControlStyles.StandardClick | ControlStyles.StandardDoubleClick, true);
}
}
}

27
src/Greenshot.Editor/Forms/ColorDialog.cs
View file

@ -21,10 +21,12 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.Globalization;
using System.Threading;
using System.Windows.Forms;
using Greenshot.Base.Controls;
using Greenshot.Base.IniFile;
using Greenshot.Editor.Configuration;
using Greenshot.Editor.Controls;
@ -114,7 +116,7 @@ namespace Greenshot.Editor.Forms
private Button CreateColorButton(Color color, int x, int y, int w, int h)
{
Button b = new Button
Button b = new GreenshotDoubleClickButton
{
BackColor = color,
FlatStyle = FlatStyle.Flat,
@ -124,10 +126,17 @@ namespace Greenshot.Editor.Forms
};
b.FlatAppearance.BorderSize = 0;
b.Click += ColorButtonClick;
_toolTip.SetToolTip(b, ColorTranslator.ToHtml(color) + " | R:" + color.R + ", G:" + color.G + ", B:" + color.B);
b.DoubleClick += ColorButtonDoubleClick;
SetButtonTooltip(b, color);
return b;
}
private void ColorButtonDoubleClick(object sender, EventArgs e)
{
ColorButtonClick(sender, e);
BtnApplyClick(sender, e);
}
private void CreateLastUsedColorButtonRow(int x, int y, int w, int h)
{
for (int i = 0; i < 12; i++)
@ -147,6 +156,7 @@ namespace Greenshot.Editor.Forms
{
_recentColorButtons[i].BackColor = EditorConfig.RecentColors[i];
_recentColorButtons[i].Enabled = true;
SetButtonTooltip(_recentColorButtons[i], EditorConfig.RecentColors[i]);
}
}
@ -189,7 +199,7 @@ namespace Greenshot.Editor.Forms
return;
}
TextBox textBox = (TextBox) sender;
TextBox textBox = (TextBox)sender;
string text = textBox.Text.Replace("#", string.Empty);
Color c;
if (int.TryParse(text, NumberStyles.AllowHexSpecifier, Thread.CurrentThread.CurrentCulture, out var i))
@ -200,7 +210,7 @@ namespace Greenshot.Editor.Forms
{
try
{
var knownColor = (KnownColor) Enum.Parse(typeof(KnownColor), text, true);
var knownColor = (KnownColor)Enum.Parse(typeof(KnownColor), text, true);
c = Color.FromKnownColor(knownColor);
}
catch (Exception)
@ -220,7 +230,7 @@ namespace Greenshot.Editor.Forms
return;
}
TextBox textBox = (TextBox) sender;
TextBox textBox = (TextBox)sender;
PreviewColor(
Color.FromArgb(GetColorPartIntFromString(textBoxAlpha.Text), GetColorPartIntFromString(textBoxRed.Text), GetColorPartIntFromString(textBoxGreen.Text),
GetColorPartIntFromString(textBoxBlue.Text)), textBox);
@ -241,10 +251,15 @@ namespace Greenshot.Editor.Forms
private void ColorButtonClick(object sender, EventArgs e)
{
Button b = (Button) sender;
Button b = (Button)sender;
PreviewColor(b.BackColor, b);
}
private void SetButtonTooltip(Button colorButton, Color color)
{
_toolTip.SetToolTip(colorButton, ColorTranslator.ToHtml(color) + " | R:" + color.R + ", G:" + color.G + ", B:" + color.B);
}
private void BtnTransparentClick(object sender, EventArgs e)
{
ColorButtonClick(sender, e);