CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-02 18:26:27 +13:00
Code Issues Projects Releases Packages Wiki Activity

Allow border size 0 for fill color only shapes

Browse source
This commit is contained in:
Jaex 2016-05-20 18:49:38 +03:00
parent c52eb0cdc8
commit 110d1eede0
5 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ShareX.ScreenCaptureLib/RegionHelpers/ShapeManager.cs
View file

@ -306,7 +306,7 @@ private void CreateContextMenu()
ToolStripLabeledNumericUpDown tslnudBorderSize = new ToolStripLabeledNumericUpDown();
tslnudBorderSize.LabeledNumericUpDownControl.Text = "Border size:";
tslnudBorderSize.LabeledNumericUpDownControl.Minimum = 1;
tslnudBorderSize.LabeledNumericUpDownControl.Minimum = 0;
tslnudBorderSize.LabeledNumericUpDownControl.Maximum = 20;
tslnudBorderSize.LabeledNumericUpDownControl.Value = config.ShapeBorderSize;
tslnudBorderSize.LabeledNumericUpDownControl.ValueChanged = (sender, e) =>

2
ShareX.ScreenCaptureLib/Shapes/Drawing/EllipseDrawingShape.cs
View file

@ -50,7 +50,7 @@ public override void Draw(Graphics g)
}
}
if (BorderColor.A > 0 && BorderSize > 0)
if (BorderSize > 0 && BorderColor.A > 0)
{
using (Pen pen = new Pen(BorderColor, BorderSize))
{

2
ShareX.ScreenCaptureLib/Shapes/Drawing/LineDrawingShape.cs
View file

@ -39,7 +39,7 @@ public class LineDrawingShape : BaseDrawingShape
public override void Draw(Graphics g)
{
if (BorderColor.A > 0 && BorderSize > 0)
if (BorderSize > 0 && BorderColor.A > 0)
{
g.SmoothingMode = SmoothingMode.HighQuality;

4
ShareX.ScreenCaptureLib/Shapes/Drawing/RectangleDrawingShape.cs
View file

@ -48,12 +48,10 @@ public override void Draw(Graphics g)
}
}
if (BorderColor.A > 0 && BorderSize > 0)
if (BorderSize > 0 && BorderColor.A > 0)
{
Rectangle rect = Rectangle.Offset(BorderSize - 1);
//g.DrawRectangleShadow(rect.Offset(1), Color.FromArgb(150, 150, 150), 3, 100, 10, new Padding(1));
using (Pen pen = new Pen(BorderColor, BorderSize) { Alignment = PenAlignment.Inset })
{
g.DrawRectangleProper(pen, rect);

2
ShareX.ScreenCaptureLib/Shapes/Drawing/RoundedRectangleDrawingShape.cs
View file

@ -51,7 +51,7 @@ public override void Draw(Graphics g)
brush = new SolidBrush(FillColor);
}
if (BorderColor.A > 0 && BorderSize > 0)
if (BorderSize > 0 && BorderColor.A > 0)
{
pen = new Pen(BorderColor, BorderSize);
}