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

Handle speech balloon border drawing issues

Browse source
This commit is contained in:
Jaex 2016-08-24 22:18:54 +03:00
parent 146f6eca53
commit 6c29817c50
2 changed files with 67 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
ShareX.ScreenCaptureLib/Shapes/Drawing/SpeechBalloonDrawingShape.cs
View file

@ -54,55 +54,91 @@ public override void OnNodeVisible()
public override void OnDraw(Graphics g)
{
if (Rectangle.Width > 10 && Rectangle.Height > 10 && !Rectangle.Contains(TailNode.Position))
if (Rectangle.Width > 10 && Rectangle.Height > 10)
{
DrawTail(g);
}
GraphicsPath gpTail = null;
base.OnDraw(g);
}
if (!Rectangle.Contains(TailNode.Position))
{
g.SmoothingMode = SmoothingMode.HighQuality;
g.ExcludeClip(Rectangle);
private void DrawTail(Graphics g)
{
g.ExcludeClip(Rectangle);
gpTail = CreateTailPath(TailWidth);
using (GraphicsPath gpTail = new GraphicsPath())
{
Point center = Rectangle.Center();
int tailOrigin = TailWidth / 2;
int tailLength = (int)MathHelpers.Distance(center, TailNode.Position);
gpTail.AddLine(0, -tailOrigin, 0, tailOrigin);
gpTail.AddLine(0, tailOrigin, tailLength, 0);
gpTail.CloseFigure();
if (FillColor.A > 0)
{
using (Brush brush = new SolidBrush(FillColor))
{
g.FillPath(brush, gpTail);
}
}
g.TranslateTransform(center.X, center.Y);
float tailDegree = MathHelpers.LookAtDegree(center, TailNode.Position);
g.RotateTransform(tailDegree);
if (BorderSize > 0 && BorderColor.A > 0)
{
using (Pen pen = new Pen(BorderColor, BorderSize))
{
g.DrawPath(pen, gpTail);
}
}
g.SmoothingMode = SmoothingMode.HighQuality;
g.SmoothingMode = SmoothingMode.None;
g.ResetClip();
}
if (FillColor.A > 0)
{
using (Brush brush = new SolidBrush(FillColor))
{
g.FillPath(brush, gpTail);
g.FillRectangle(brush, Rectangle);
}
}
if (BorderSize > 0 && BorderColor.A > 0)
{
using (Pen pen = new Pen(BorderColor, BorderSize))
if (gpTail != null)
{
g.DrawPath(pen, gpTail);
using (Region region = new Region(gpTail))
{
g.ExcludeClip(region);
}
}
Rectangle rect = Rectangle.Offset(BorderSize - 1);
using (Pen pen = new Pen(BorderColor, BorderSize) { Alignment = PenAlignment.Inset })
{
g.DrawRectangleProper(pen, rect);
}
g.ResetClip();
}
g.SmoothingMode = SmoothingMode.None;
if (gpTail != null)
{
gpTail.Dispose();
}
g.ResetTransform();
DrawText(g);
}
}
g.ResetClip();
protected GraphicsPath CreateTailPath(int tailWidth)
{
GraphicsPath gpTail = new GraphicsPath();
Point center = Rectangle.Center();
int tailOrigin = tailWidth / 2;
int tailLength = (int)MathHelpers.Distance(center, TailNode.Position);
gpTail.AddLine(0, -tailOrigin, 0, tailOrigin);
gpTail.AddLine(0, tailOrigin, tailLength, 0);
gpTail.CloseFigure();
using (Matrix matrix = new Matrix())
{
matrix.Translate(center.X, center.Y);
float tailDegree = MathHelpers.LookAtDegree(center, TailNode.Position);
matrix.Rotate(tailDegree);
gpTail.Transform(matrix);
}
return gpTail;
}
public override void OnNodeUpdate()

5
ShareX.ScreenCaptureLib/Shapes/Drawing/TextDrawingShape.cs
View file

@ -56,6 +56,11 @@ public override void OnDraw(Graphics g)
{
base.OnDraw(g);
DrawText(g);
}
protected void DrawText(Graphics g)
{
if (!string.IsNullOrEmpty(Text) && Rectangle.Width > 10 && Rectangle.Height > 10)
{
using (Font font = new Font(TextOptions.Font, TextOptions.Size, TextOptions.Style))