From d8a803f9ce047b52eee3ab1523527113b3179506 Mon Sep 17 00:00:00 2001 From: Jaex Date: Wed, 26 Nov 2014 19:48:25 +0200 Subject: [PATCH] fixed surface prepare error --- ScreenCaptureLib/Forms/DiamondRegion.cs | 5 ----- ScreenCaptureLib/Forms/EllipseRegion.cs | 5 ----- ScreenCaptureLib/Forms/FreeHandRegion.cs | 4 +--- ScreenCaptureLib/Forms/PolygonRegion.cs | 4 +--- ScreenCaptureLib/Forms/RectangleRegion.cs | 3 +-- ScreenCaptureLib/Forms/RoundedRectangleRegion.cs | 4 +--- ScreenCaptureLib/Forms/Surface.cs | 8 +------- ScreenCaptureLib/Forms/TriangleRegion.cs | 4 +--- ShareX/Forms/MainForm.resx | 4 ++-- ShareX/Forms/MainForm.tr.resx | 3 --- ShareX/TaskHelpers.cs | 8 +++----- 11 files changed, 11 insertions(+), 41 deletions(-) diff --git a/ScreenCaptureLib/Forms/DiamondRegion.cs b/ScreenCaptureLib/Forms/DiamondRegion.cs index f91a7322a..7fdc867f1 100644 --- a/ScreenCaptureLib/Forms/DiamondRegion.cs +++ b/ScreenCaptureLib/Forms/DiamondRegion.cs @@ -31,11 +31,6 @@ namespace ScreenCaptureLib { public class DiamondRegion : RectangleRegion { - public DiamondRegion(Image backgroundImage = null) - : base(backgroundImage) - { - } - protected override void AddShapePath(GraphicsPath graphicsPath, Rectangle rect) { graphicsPath.AddDiamond(rect); diff --git a/ScreenCaptureLib/Forms/EllipseRegion.cs b/ScreenCaptureLib/Forms/EllipseRegion.cs index 2d8d960a6..ad2a7a5e8 100644 --- a/ScreenCaptureLib/Forms/EllipseRegion.cs +++ b/ScreenCaptureLib/Forms/EllipseRegion.cs @@ -30,11 +30,6 @@ namespace ScreenCaptureLib { public class EllipseRegion : RectangleRegion { - public EllipseRegion(Image backgroundImage = null) - : base(backgroundImage) - { - } - protected override void AddShapePath(GraphicsPath graphicsPath, Rectangle rect) { graphicsPath.AddEllipse(rect); diff --git a/ScreenCaptureLib/Forms/FreeHandRegion.cs b/ScreenCaptureLib/Forms/FreeHandRegion.cs index d684ceb80..935e0625e 100644 --- a/ScreenCaptureLib/Forms/FreeHandRegion.cs +++ b/ScreenCaptureLib/Forms/FreeHandRegion.cs @@ -38,12 +38,10 @@ public class FreeHandRegion : Surface private bool isAreaCreated; private Rectangle currentArea; - public FreeHandRegion(Image backgroundImage = null) - : base(backgroundImage) + public FreeHandRegion() { points = new List(128); regionFillPath = new GraphicsPath(); - lastNode = new NodeObject() { Shape = NodeShape.Circle }; DrawableObjects.Add(lastNode); } diff --git a/ScreenCaptureLib/Forms/PolygonRegion.cs b/ScreenCaptureLib/Forms/PolygonRegion.cs index 4d8a496ce..13b67ee44 100644 --- a/ScreenCaptureLib/Forms/PolygonRegion.cs +++ b/ScreenCaptureLib/Forms/PolygonRegion.cs @@ -38,11 +38,9 @@ public class PolygonRegion : Surface private bool isAreaCreated; private Rectangle currentArea; - public PolygonRegion(Image backgroundImage = null) - : base(backgroundImage) + public PolygonRegion() { nodes = new List(); - MouseDown += PolygonRegionSurface_MouseDown; } diff --git a/ScreenCaptureLib/Forms/RectangleRegion.cs b/ScreenCaptureLib/Forms/RectangleRegion.cs index 367f60406..23e6bad52 100644 --- a/ScreenCaptureLib/Forms/RectangleRegion.cs +++ b/ScreenCaptureLib/Forms/RectangleRegion.cs @@ -44,8 +44,7 @@ public class RectangleRegion : Surface // For screen ruler public bool RulerMode { get; set; } - public RectangleRegion(Image backgroundImage = null) - : base(backgroundImage) + public RectangleRegion() { AreaManager = new AreaManager(this); KeyDown += RectangleRegion_KeyDown; diff --git a/ScreenCaptureLib/Forms/RoundedRectangleRegion.cs b/ScreenCaptureLib/Forms/RoundedRectangleRegion.cs index d9092a0a1..9663a54b7 100644 --- a/ScreenCaptureLib/Forms/RoundedRectangleRegion.cs +++ b/ScreenCaptureLib/Forms/RoundedRectangleRegion.cs @@ -36,12 +36,10 @@ public class RoundedRectangleRegion : RectangleRegion public float Radius { get; set; } public int RadiusIncrement { get; set; } - public RoundedRectangleRegion(Image backgroundImage = null) - : base(backgroundImage) + public RoundedRectangleRegion() { Radius = 25; RadiusIncrement = 3; - KeyDown += RoundedRectangleRegion_KeyDown; } diff --git a/ScreenCaptureLib/Forms/Surface.cs b/ScreenCaptureLib/Forms/Surface.cs index 07b6639ec..028779f1f 100644 --- a/ScreenCaptureLib/Forms/Surface.cs +++ b/ScreenCaptureLib/Forms/Surface.cs @@ -58,7 +58,7 @@ public class Surface : Form public static GraphicsPath LastRegionFillPath, LastRegionDrawPath; - public Surface(Image backgroundImage = null) + public Surface() { ScreenRectangle = CaptureHelpers.GetScreenBounds(); ScreenRectangle0Based = CaptureHelpers.ScreenToClient(ScreenRectangle); @@ -70,12 +70,6 @@ public Surface(Image backgroundImage = null) Cursor = new Cursor(cursorStream); } - if (backgroundImage != null) - { - SurfaceImage = backgroundImage; - Prepare(); - } - DrawableObjects = new List(); Config = new SurfaceOptions(); timer = new Stopwatch(); diff --git a/ScreenCaptureLib/Forms/TriangleRegion.cs b/ScreenCaptureLib/Forms/TriangleRegion.cs index 8b9666c65..0f6900325 100644 --- a/ScreenCaptureLib/Forms/TriangleRegion.cs +++ b/ScreenCaptureLib/Forms/TriangleRegion.cs @@ -34,11 +34,9 @@ public class TriangleRegion : RectangleRegion { public TriangleAngle Angle { get; set; } - public TriangleRegion(Image backgroundImage = null) - : base(backgroundImage) + public TriangleRegion() { Angle = TriangleAngle.Top; - KeyDown += TriangleRegion_KeyDown; } diff --git a/ShareX/Forms/MainForm.resx b/ShareX/Forms/MainForm.resx index 2e5cb57c8..76d2c3ae9 100644 --- a/ShareX/Forms/MainForm.resx +++ b/ShareX/Forms/MainForm.resx @@ -1478,7 +1478,7 @@ ShareX - + @Invariant True @@ -1499,7 +1499,7 @@ ShareX - + @Invariant chFilename diff --git a/ShareX/Forms/MainForm.tr.resx b/ShareX/Forms/MainForm.tr.resx index 669fd5b0c..354549bcd 100644 --- a/ShareX/Forms/MainForm.tr.resx +++ b/ShareX/Forms/MainForm.tr.resx @@ -117,9 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Dosyaları bu pencereye sürükleyip bırakabilirsiniz - Dosya adı diff --git a/ShareX/TaskHelpers.cs b/ShareX/TaskHelpers.cs index 3add559f7..3197862fb 100644 --- a/ShareX/TaskHelpers.cs +++ b/ShareX/TaskHelpers.cs @@ -348,8 +348,7 @@ public static PointInfo SelectPointColor(SurfaceOptions surfaceOptions = null) surfaceOptions = new SurfaceOptions(); } - using (Image fullscreen = Screenshot.CaptureFullscreen()) - using (RectangleRegion surface = new RectangleRegion(fullscreen)) + using (RectangleRegion surface = new RectangleRegion()) { surface.Config = surfaceOptions; surface.OneClickMode = true; @@ -360,7 +359,7 @@ public static PointInfo SelectPointColor(SurfaceOptions surfaceOptions = null) { PointInfo pointInfo = new PointInfo(); pointInfo.Position = CaptureHelpers.ClientToScreen(surface.OneClickPosition); - pointInfo.Color = ((Bitmap)fullscreen).GetPixel(surface.OneClickPosition.X, surface.OneClickPosition.Y); + pointInfo.Color = ((Bitmap)surface.SurfaceImage).GetPixel(surface.OneClickPosition.X, surface.OneClickPosition.Y); return pointInfo; } } @@ -512,8 +511,7 @@ public static void OpenScreenColorPicker() public static void OpenRuler() { - using (Image fullscreen = Screenshot.CaptureFullscreen()) - using (RectangleRegion surface = new RectangleRegion(fullscreen)) + using (RectangleRegion surface = new RectangleRegion()) { surface.RulerMode = true; surface.Config.QuickCrop = false;