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

Added BorderColor option to ColorButton

Browse source
This commit is contained in:
Jaex 2018-04-24 11:13:23 +03:00
parent f342308c34
commit d146ab68d5
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -88,8 +88,9 @@ private void PrepareRecentColors()
{ {
Color = new HSB(i / 32d, 1d, 1d), Color = new HSB(i / 32d, 1d, 1d),
Size = new Size(16, 16), Size = new Size(16, 16),
Offset = 2, Offset = 0,
Margin = new Padding(0), BorderColor = Color.FromArgb(100, 100, 100),
Margin = new Padding(1),
ManualButtonClick = true ManualButtonClick = true
}; };

13
ShareX.HelpersLib/Controls/ColorButton.cs
View file

@ -51,6 +51,9 @@ public Color Color
} }
} }
[DefaultValue(typeof(Color), "DarkGray")]
public Color BorderColor { get; set; } = Color.DarkGray;
[DefaultValue(3)] [DefaultValue(3)]
public int Offset { get; set; } = 3; public int Offset { get; set; } = 3;
@ -85,7 +88,10 @@ public void ShowColorDialog()
protected override void OnPaint(PaintEventArgs pevent) protected override void OnPaint(PaintEventArgs pevent)
{ {
base.OnPaint(pevent); if (Offset > 0)
{
base.OnPaint(pevent);
}
int boxSize = ClientRectangle.Height - Offset * 2; int boxSize = ClientRectangle.Height - Offset * 2;
Rectangle boxRectangle = new Rectangle(ClientRectangle.Width - Offset - boxSize, Offset, boxSize, boxSize); Rectangle boxRectangle = new Rectangle(ClientRectangle.Width - Offset - boxSize, Offset, boxSize, boxSize);
@ -108,7 +114,10 @@ protected override void OnPaint(PaintEventArgs pevent)
} }
} }
g.DrawRectangleProper(Pens.DarkGray, boxRectangle); using (Pen borderPen = new Pen(BorderColor))
{
g.DrawRectangleProper(borderPen, boxRectangle);
}
} }
} }
} }