mirror of
https://github.com/greenshot/greenshot
synced 2025-08-14 02:37:03 -07:00
BUG-1719: Although it's more a feature... I made the parsing respect HTML color NAMES.
This commit is contained in:
RKrom
parent
4e45ca651e
commit
a4210cbd89
2 changed files with 123 additions and 111 deletions
4
Greenshot/Forms/ColorDialog.Designer.cs
generated
4
Greenshot/Forms/ColorDialog.Designer.cs
generated
|
|
@ -75,7 +75,7 @@ namespace Greenshot {
|
|||
this.btnTransparent.TabStop = false;
|
||||
this.btnTransparent.Text = "Transparent";
|
||||
this.btnTransparent.UseVisualStyleBackColor = false;
|
||||
this.btnTransparent.Click += new System.EventHandler(this.btnTransparentClick);
|
||||
this.btnTransparent.Click += new System.EventHandler(this.BtnTransparentClick);
|
||||
//
|
||||
// colorPanel
|
||||
//
|
||||
|
|
@ -225,7 +225,7 @@ namespace Greenshot {
|
|||
this.pipette.Name = "pipette";
|
||||
this.pipette.Size = new System.Drawing.Size(33, 23);
|
||||
this.pipette.TabIndex = 13;
|
||||
this.pipette.PipetteUsed += new System.EventHandler<Greenshot.Controls.PipetteUsedArgs>(this.pipetteUsed);
|
||||
this.pipette.PipetteUsed += new System.EventHandler<Greenshot.Controls.PipetteUsedArgs>(this.PipetteUsed);
|
||||
//
|
||||
// ColorDialog
|
||||
//
|
||||
|
|
|
|||
|
|
@ -18,6 +18,10 @@
|
|||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
using Greenshot.Configuration;
|
||||
using Greenshot.Controls;
|
||||
using Greenshot.IniFile;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Drawing;
|
||||
|
|
@ -25,10 +29,6 @@ using System.Globalization;
|
|||
using System.Threading;
|
||||
using System.Windows.Forms;
|
||||
|
||||
using Greenshot.Configuration;
|
||||
using Greenshot.Controls;
|
||||
using Greenshot.IniFile;
|
||||
|
||||
namespace Greenshot {
|
||||
/// <summary>
|
||||
/// Description of ColorDialog.
|
||||
|
|
@ -41,188 +41,200 @@ namespace Greenshot {
|
|||
SuspendLayout();
|
||||
InitializeComponent();
|
||||
SuspendLayout();
|
||||
createColorPalette(5,5,15,15);
|
||||
createLastUsedColorButtonRow(5,190,15,15);
|
||||
CreateColorPalette(5, 5, 15, 15);
|
||||
CreateLastUsedColorButtonRow(5, 190, 15, 15);
|
||||
ResumeLayout();
|
||||
updateRecentColorsButtonRow();
|
||||
UpdateRecentColorsButtonRow();
|
||||
}
|
||||
|
||||
public static ColorDialog GetInstance() {
|
||||
if(uniqueInstance == null) {
|
||||
if (uniqueInstance == null) {
|
||||
uniqueInstance = new ColorDialog();
|
||||
}
|
||||
return uniqueInstance;
|
||||
}
|
||||
|
||||
private List<Button> colorButtons = new List<Button>();
|
||||
private List<Button> recentColorButtons = new List<Button>();
|
||||
private ToolTip toolTip = new ToolTip();
|
||||
private bool updateInProgress = false;
|
||||
|
||||
private readonly List<Button> _colorButtons = new List<Button>();
|
||||
private readonly List<Button> _recentColorButtons = new List<Button>();
|
||||
private readonly ToolTip _toolTip = new ToolTip();
|
||||
private bool _updateInProgress = false;
|
||||
|
||||
public Color Color {
|
||||
get {return colorPanel.BackColor;}
|
||||
set {previewColor(value,this);}
|
||||
get { return colorPanel.BackColor; }
|
||||
set { PreviewColor(value, this); }
|
||||
}
|
||||
|
||||
|
||||
#region user interface generation
|
||||
private void createColorPalette(int x, int y, int w, int h) {
|
||||
createColorButtonColumn(255,0,0, x, y, w, h, 11);
|
||||
private void CreateColorPalette(int x, int y, int w, int h) {
|
||||
CreateColorButtonColumn(255, 0, 0, x, y, w, h, 11);
|
||||
x += w;
|
||||
createColorButtonColumn(255,255/2,0, x, y, w, h, 11);
|
||||
CreateColorButtonColumn(255, 255 / 2, 0, x, y, w, h, 11);
|
||||
x += w;
|
||||
createColorButtonColumn(255,255,0, x, y, w, h, 11);
|
||||
CreateColorButtonColumn(255, 255, 0, x, y, w, h, 11);
|
||||
x += w;
|
||||
createColorButtonColumn(255/2,255,0, x, y, w, h, 11);
|
||||
CreateColorButtonColumn(255 / 2, 255, 0, x, y, w, h, 11);
|
||||
x += w;
|
||||
createColorButtonColumn(0,255,0, x, y, w, h, 11);
|
||||
CreateColorButtonColumn(0, 255, 0, x, y, w, h, 11);
|
||||
x += w;
|
||||
createColorButtonColumn(0,255,255/2, x, y, w, h, 11);
|
||||
CreateColorButtonColumn(0, 255, 255 / 2, x, y, w, h, 11);
|
||||
x += w;
|
||||
createColorButtonColumn(0,255,255, x, y, w, h, 11);
|
||||
CreateColorButtonColumn(0, 255, 255, x, y, w, h, 11);
|
||||
x += w;
|
||||
createColorButtonColumn(0,255/2,255, x, y, w, h, 11);
|
||||
CreateColorButtonColumn(0, 255 / 2, 255, x, y, w, h, 11);
|
||||
x += w;
|
||||
createColorButtonColumn(0,0,255, x, y, w, h, 11);
|
||||
CreateColorButtonColumn(0, 0, 255, x, y, w, h, 11);
|
||||
x += w;
|
||||
createColorButtonColumn(255/2,0,255, x, y, w, h, 11);
|
||||
CreateColorButtonColumn(255 / 2, 0, 255, x, y, w, h, 11);
|
||||
x += w;
|
||||
createColorButtonColumn(255,0,255, x, y, w, h, 11);
|
||||
CreateColorButtonColumn(255, 0, 255, x, y, w, h, 11);
|
||||
x += w;
|
||||
createColorButtonColumn(255,0,255/2, x, y, w, h, 11);
|
||||
CreateColorButtonColumn(255, 0, 255 / 2, x, y, w, h, 11);
|
||||
x += w + 5;
|
||||
createColorButtonColumn(255/2,255/2,255/2, x, y, w, h, 11);
|
||||
|
||||
Controls.AddRange(colorButtons.ToArray());
|
||||
CreateColorButtonColumn(255 / 2, 255 / 2, 255 / 2, x, y, w, h, 11);
|
||||
|
||||
Controls.AddRange(_colorButtons.ToArray());
|
||||
}
|
||||
private void createColorButtonColumn(int red, int green, int blue, int x, int y, int w, int h, int shades) {
|
||||
|
||||
private void CreateColorButtonColumn(int red, int green, int blue, int x, int y, int w, int h, int shades) {
|
||||
int shadedColorsNum = (shades - 1) / 2;
|
||||
for(int i=0; i<=shadedColorsNum; i++) {
|
||||
colorButtons.Add(createColorButton(red * i / shadedColorsNum, green * i /shadedColorsNum, blue * i / shadedColorsNum, x, y + i * h, w, h));
|
||||
if(i>0) colorButtons.Add(createColorButton(red + (255 - red) * i / shadedColorsNum, green + (255 - green)* i /shadedColorsNum, blue+ (255 - blue) * i / shadedColorsNum, x, y + (i+shadedColorsNum) * h, w,h));
|
||||
for (int i = 0; i <= shadedColorsNum; i++) {
|
||||
_colorButtons.Add(CreateColorButton(red * i / shadedColorsNum, green * i / shadedColorsNum, blue * i / shadedColorsNum, x, y + i * h, w, h));
|
||||
if (i > 0) _colorButtons.Add(CreateColorButton(red + (255 - red) * i / shadedColorsNum, green + (255 - green) * i / shadedColorsNum, blue + (255 - blue) * i / shadedColorsNum, x, y + (i + shadedColorsNum) * h, w, h));
|
||||
}
|
||||
}
|
||||
private Button createColorButton(int red, int green, int blue, int x, int y, int w, int h) {
|
||||
return createColorButton(Color.FromArgb(255, red, green, blue), x, y, w, h);
|
||||
|
||||
private Button CreateColorButton(int red, int green, int blue, int x, int y, int w, int h) {
|
||||
return CreateColorButton(Color.FromArgb(255, red, green, blue), x, y, w, h);
|
||||
}
|
||||
private Button createColorButton(Color color, int x, int y, int w, int h) {
|
||||
|
||||
private Button CreateColorButton(Color color, int x, int y, int w, int h) {
|
||||
Button b = new Button();
|
||||
b.BackColor = color;
|
||||
b.FlatAppearance.BorderSize = 0;
|
||||
b.FlatStyle = FlatStyle.Flat;
|
||||
b.Location = new Point(x,y);
|
||||
b.Size = new Size(w,h);
|
||||
b.Location = new Point(x, y);
|
||||
b.Size = new Size(w, h);
|
||||
b.TabStop = false;
|
||||
b.Click += colorButtonClick;
|
||||
toolTip.SetToolTip(b,ColorTranslator.ToHtml(color)+" | R:"+color.R +", G:"+color.G+", B:"+color.B);
|
||||
b.Click += ColorButtonClick;
|
||||
_toolTip.SetToolTip(b, ColorTranslator.ToHtml(color) + " | R:" + color.R + ", G:" + color.G + ", B:" + color.B);
|
||||
return b;
|
||||
}
|
||||
private void createLastUsedColorButtonRow(int x, int y, int w, int h) {
|
||||
for(int i=0; i<12; i++) {
|
||||
Button b = createColorButton(Color.Transparent, x, y, w, h);
|
||||
|
||||
private void CreateLastUsedColorButtonRow(int x, int y, int w, int h) {
|
||||
for (int i = 0; i < 12; i++) {
|
||||
Button b = CreateColorButton(Color.Transparent, x, y, w, h);
|
||||
b.Enabled = false;
|
||||
recentColorButtons.Add(b);
|
||||
_recentColorButtons.Add(b);
|
||||
x += w;
|
||||
}
|
||||
Controls.AddRange(recentColorButtons.ToArray());
|
||||
Controls.AddRange(_recentColorButtons.ToArray());
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
#region update user interface
|
||||
private void updateRecentColorsButtonRow() {
|
||||
for(int i=0; i<editorConfiguration.RecentColors.Count && i<12; i++) {
|
||||
recentColorButtons[i].BackColor = editorConfiguration.RecentColors[i];
|
||||
recentColorButtons[i].Enabled = true;
|
||||
private void UpdateRecentColorsButtonRow() {
|
||||
for (int i = 0; i < editorConfiguration.RecentColors.Count && i < 12; i++) {
|
||||
_recentColorButtons[i].BackColor = editorConfiguration.RecentColors[i];
|
||||
_recentColorButtons[i].Enabled = true;
|
||||
}
|
||||
}
|
||||
|
||||
private void previewColor(Color c, Control trigger) {
|
||||
updateInProgress = true;
|
||||
colorPanel.BackColor = c;
|
||||
if(trigger != textBoxHtmlColor) {
|
||||
textBoxHtmlColor.Text = ColorTranslator.ToHtml(c);
|
||||
} else {
|
||||
if(!textBoxHtmlColor.Text.StartsWith("#")) {
|
||||
int selStart = textBoxHtmlColor.SelectionStart;
|
||||
int selLength = textBoxHtmlColor.SelectionLength;
|
||||
textBoxHtmlColor.Text = "#" +textBoxHtmlColor.Text;
|
||||
textBoxHtmlColor.Select(selStart+1, selLength+1);
|
||||
}
|
||||
private void PreviewColor(Color colorToPreview, Control trigger) {
|
||||
_updateInProgress = true;
|
||||
colorPanel.BackColor = colorToPreview;
|
||||
if (trigger != textBoxHtmlColor) {
|
||||
textBoxHtmlColor.Text = ColorTranslator.ToHtml(colorToPreview);
|
||||
}
|
||||
if(trigger != textBoxRed && trigger != textBoxGreen && trigger != textBoxBlue && trigger != textBoxAlpha) {
|
||||
textBoxRed.Text = c.R.ToString();
|
||||
textBoxGreen.Text = c.G.ToString();
|
||||
textBoxBlue.Text = c.B.ToString();
|
||||
textBoxAlpha.Text = c.A.ToString();
|
||||
if (trigger != textBoxRed && trigger != textBoxGreen && trigger != textBoxBlue && trigger != textBoxAlpha) {
|
||||
textBoxRed.Text = colorToPreview.R.ToString();
|
||||
textBoxGreen.Text = colorToPreview.G.ToString();
|
||||
textBoxBlue.Text = colorToPreview.B.ToString();
|
||||
textBoxAlpha.Text = colorToPreview.A.ToString();
|
||||
}
|
||||
updateInProgress = false;
|
||||
_updateInProgress = false;
|
||||
}
|
||||
|
||||
private void addToRecentColors(Color c) {
|
||||
|
||||
private void AddToRecentColors(Color c) {
|
||||
editorConfiguration.RecentColors.Remove(c);
|
||||
editorConfiguration.RecentColors.Insert(0, c);
|
||||
if(editorConfiguration.RecentColors.Count > 12) editorConfiguration.RecentColors.RemoveRange(12,editorConfiguration.RecentColors.Count-12);
|
||||
updateRecentColorsButtonRow();
|
||||
if (editorConfiguration.RecentColors.Count > 12) {
|
||||
editorConfiguration.RecentColors.RemoveRange(12, editorConfiguration.RecentColors.Count - 12);
|
||||
}
|
||||
UpdateRecentColorsButtonRow();
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
#region textbox event handlers
|
||||
void TextBoxHexadecimalTextChanged(object sender, EventArgs e)
|
||||
{
|
||||
if(updateInProgress) return;
|
||||
TextBox tb = (TextBox) sender;
|
||||
string t = tb.Text.Replace("#","");
|
||||
void TextBoxHexadecimalTextChanged(object sender, EventArgs e) {
|
||||
if (_updateInProgress) {
|
||||
return;
|
||||
}
|
||||
TextBox textBox = (TextBox)sender;
|
||||
string text = textBox.Text.Replace("#", "");
|
||||
int i = 0;
|
||||
Int32.TryParse(t, NumberStyles.AllowHexSpecifier, Thread.CurrentThread.CurrentCulture, out i);
|
||||
Color c = Color.FromArgb(i);
|
||||
Color c;
|
||||
if (Int32.TryParse(text, NumberStyles.AllowHexSpecifier, Thread.CurrentThread.CurrentCulture, out i)) {
|
||||
c = Color.FromArgb(i);
|
||||
} else {
|
||||
KnownColor knownColor;
|
||||
try {
|
||||
knownColor = (KnownColor)Enum.Parse(typeof(KnownColor), text, true);
|
||||
c = Color.FromKnownColor(knownColor);
|
||||
} catch (Exception) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
Color opaqueColor = Color.FromArgb(255, c.R, c.G, c.B);
|
||||
previewColor(opaqueColor, tb);
|
||||
PreviewColor(opaqueColor, textBox);
|
||||
}
|
||||
void TextBoxRGBTextChanged(object sender, EventArgs e)
|
||||
{
|
||||
if(updateInProgress) return;
|
||||
TextBox tb = (TextBox) sender;
|
||||
previewColor(Color.FromArgb(getColorPartIntFromString(textBoxAlpha.Text),getColorPartIntFromString(textBoxRed.Text),getColorPartIntFromString(textBoxGreen.Text),getColorPartIntFromString(textBoxBlue.Text)), tb);
|
||||
|
||||
void TextBoxRGBTextChanged(object sender, EventArgs e) {
|
||||
if (_updateInProgress) {
|
||||
return;
|
||||
}
|
||||
TextBox textBox = (TextBox)sender;
|
||||
PreviewColor(Color.FromArgb(GetColorPartIntFromString(textBoxAlpha.Text), GetColorPartIntFromString(textBoxRed.Text), GetColorPartIntFromString(textBoxGreen.Text), GetColorPartIntFromString(textBoxBlue.Text)), textBox);
|
||||
}
|
||||
|
||||
void TextBoxGotFocus(object sender, EventArgs e) {
|
||||
textBoxHtmlColor.SelectAll();
|
||||
}
|
||||
|
||||
void TextBoxKeyDown(object sender, KeyEventArgs e) {
|
||||
if(e.KeyCode == Keys.Return || e.KeyCode == Keys.Enter) {
|
||||
addToRecentColors(colorPanel.BackColor);
|
||||
if (e.KeyCode == Keys.Return || e.KeyCode == Keys.Enter) {
|
||||
AddToRecentColors(colorPanel.BackColor);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
#region button event handlers
|
||||
void colorButtonClick(object sender, EventArgs e) {
|
||||
Button b = (Button) sender;
|
||||
previewColor(b.BackColor, b);
|
||||
void ColorButtonClick(object sender, EventArgs e) {
|
||||
Button b = (Button)sender;
|
||||
PreviewColor(b.BackColor, b);
|
||||
}
|
||||
|
||||
void btnTransparentClick(object sender, EventArgs e)
|
||||
{
|
||||
colorButtonClick(sender, e);
|
||||
void BtnTransparentClick(object sender, EventArgs e) {
|
||||
ColorButtonClick(sender, e);
|
||||
}
|
||||
void BtnApplyClick(object sender, EventArgs e)
|
||||
{
|
||||
void BtnApplyClick(object sender, EventArgs e) {
|
||||
DialogResult = DialogResult.OK;
|
||||
Hide();
|
||||
addToRecentColors(colorPanel.BackColor);
|
||||
AddToRecentColors(colorPanel.BackColor);
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
#region helper functions
|
||||
private int getColorPartIntFromString(string s){
|
||||
private int GetColorPartIntFromString(string s) {
|
||||
int ret = 0;
|
||||
Int32.TryParse(s,out ret);
|
||||
if(ret < 0) ret = 0;
|
||||
else if(ret > 255) ret = 255;
|
||||
Int32.TryParse(s, out ret);
|
||||
if (ret < 0) ret = 0;
|
||||
else if (ret > 255) ret = 255;
|
||||
return ret;
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
private void pipetteUsed(object sender, PipetteUsedArgs e) {
|
||||
#endregion
|
||||
|
||||
private void PipetteUsed(object sender, PipetteUsedArgs e) {
|
||||
Color = e.color;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue