github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-20 21:43:24 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleaner fix for the Zoom bug

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2326 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-11-28 18:02:54 +00:00
commit c5fef12c9b
1 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Greenshot/Forms/CaptureForm.cs
View file

@ -514,11 +514,10 @@ namespace Greenshot.Forms {
graphics.SmoothingMode = SmoothingMode.None; graphics.SmoothingMode = SmoothingMode.None;
graphics.InterpolationMode = InterpolationMode.NearestNeighbor; graphics.InterpolationMode = InterpolationMode.NearestNeighbor;
graphics.CompositingQuality = CompositingQuality.HighSpeed; graphics.CompositingQuality = CompositingQuality.HighSpeed;
graphics.PixelOffsetMode = PixelOffsetMode.None; graphics.PixelOffsetMode = PixelOffsetMode.HighQuality;
int pixelThickness = destinationRectangle.Width / sourceRectangle.Width;
using (GraphicsPath path = new GraphicsPath()) { using (GraphicsPath path = new GraphicsPath()) {
path.AddEllipse(new Rectangle(destinationRectangle.Location, new Size(destinationRectangle.Width - pixelThickness, destinationRectangle.Height - pixelThickness))); path.AddEllipse(destinationRectangle);
using (Region clipRegion = new Region(path)) { using (Region clipRegion = new Region(path)) {
graphics.Clip = clipRegion; graphics.Clip = clipRegion;
graphics.FillRectangle(backgroundBrush,destinationRectangle); graphics.FillRectangle(backgroundBrush,destinationRectangle);
@ -526,15 +525,24 @@ namespace Greenshot.Forms {
} }
} }
int pixelThickness = destinationRectangle.Width / sourceRectangle.Width;
using (Pen pen = new Pen(Color.Black, pixelThickness)) { using (Pen pen = new Pen(Color.Black, pixelThickness)) {
int halfWidth = (destinationRectangle.Width >> 1) - (pixelThickness >> 1); int halfWidth = destinationRectangle.Width / 2;
int halfWidthEnd = (destinationRectangle.Width >> 1) - pixelThickness; int halfWidthEnd = (destinationRectangle.Width / 2) - (pixelThickness / 2);
int halfHeight = (destinationRectangle.Height >> 1) - (pixelThickness >> 1); int halfHeight = destinationRectangle.Height / 2;
int halfHeightEnd = (destinationRectangle.Height >> 1) - pixelThickness; int halfHeightEnd = (destinationRectangle.Height / 2) - (pixelThickness / 2);
graphics.DrawLine(pen, destinationRectangle.X + halfWidth, destinationRectangle.Y, destinationRectangle.X + halfWidth, destinationRectangle.Y + halfHeightEnd);
graphics.DrawLine(pen, destinationRectangle.X + halfWidth, destinationRectangle.Y + halfHeightEnd + pixelThickness, destinationRectangle.X + halfWidth, destinationRectangle.Y + destinationRectangle.Height); int drawAtHeight = destinationRectangle.Y + halfHeight;
graphics.DrawLine(pen, destinationRectangle.X, destinationRectangle.Y + halfHeight, destinationRectangle.X + halfWidthEnd, destinationRectangle.Y + halfHeight); int drawAtWidth = destinationRectangle.X + halfWidth;
graphics.DrawLine(pen, destinationRectangle.X + halfWidthEnd + pixelThickness, destinationRectangle.Y + halfHeight, destinationRectangle.X + destinationRectangle.Width, destinationRectangle.Y + halfHeight);
// Vertical top to middle
graphics.DrawLine(pen, drawAtWidth, destinationRectangle.Y, drawAtWidth, destinationRectangle.Y + halfHeightEnd);
// Vertical middle + 1 to bottom
graphics.DrawLine(pen, drawAtWidth, destinationRectangle.Y + halfHeightEnd + pixelThickness, drawAtWidth, destinationRectangle.Y + destinationRectangle.Height);
// Horizontal left to middle
graphics.DrawLine(pen, destinationRectangle.X, drawAtHeight, destinationRectangle.X + halfWidthEnd, drawAtHeight);
// Horizontal middle + 1 to right
graphics.DrawLine(pen, destinationRectangle.X + halfWidthEnd + pixelThickness, drawAtHeight, destinationRectangle.X + destinationRectangle.Width, drawAtHeight);
} }
} }