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

Render drawing shapes to result image

Browse source
This commit is contained in:
Jaex 2016-05-03 14:54:02 +03:00
parent c69ca8cab7
commit 7a41290dad
3 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
ShareX.ScreenCaptureLib/Forms/RectangleRegion.cs
View file

@ -478,6 +478,12 @@ protected virtual void WriteTips(StringBuilder sb)
if (AreaManager.CurrentShapeType == ShapeType.RegionDiamond) sb.Append("-> ");
sb.AppendLine(Resources.RectangleRegion_WriteTips__Numpad_5__Diamond_shape);
//TODO: Translate
if (AreaManager.CurrentShapeType == ShapeType.DrawingRectangle) sb.Append("-> ");
sb.AppendLine("[Numpad 7] Rectangle drawing");
if (AreaManager.CurrentShapeType == ShapeType.DrawingRoundedRectangle) sb.Append("-> ");
sb.AppendLine("[Numpad 8] Rounded rectangle drawing");
switch (AreaManager.CurrentShapeType)
{
case ShapeType.RegionRoundedRectangle:
@ -721,6 +727,25 @@ public void UpdateRegionPath()
}
}
public override Image GetResultImage()
{
if (SurfaceImage != null)
{
using (Graphics g = Graphics.FromImage(SurfaceImage))
{
foreach (BaseDrawingShape shape in AreaManager.DrawingShapes)
{
if (shape != null)
{
shape.Draw(g);
}
}
}
}
return base.GetResultImage();
}
protected override void Dispose(bool disposing)
{
if (bmpSurfaceImage != null)

2
ShareX.ScreenCaptureLib/Forms/Surface.cs
View file

@ -241,7 +241,7 @@ protected override void OnPaint(PaintEventArgs e)
Invalidate();
}
public virtual Image GetRegionImage()
public virtual Image GetResultImage()
{
return ShapeCaptureHelpers.GetRegionImage(SurfaceImage, regionFillPath, regionDrawPath, Config);
}

2
ShareX/Forms/MainForm.cs
View file

@ -2107,7 +2107,7 @@ private void CaptureRegion(CaptureType captureType, TaskSettings taskSettings, b
{
using (screenshot)
{
img = surface.GetRegionImage();
img = surface.GetResultImage();
if (taskSettings.UploadSettings.RegionCaptureUseWindowPattern)
{