mirror of
https://github.com/greenshot/greenshot
synced 2025-08-14 10:47:02 -07:00
Removed Freehand rotate, didn't get it working and changed the resx files from Version 4 to 2 as this causes problems in Visual C# Express 2010
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1743 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
parent
aa7e901680
commit
a506c15d18
5 changed files with 27 additions and 31 deletions
|
@ -592,6 +592,12 @@ namespace Greenshot.Drawing {
|
|||
Invalidate();
|
||||
}
|
||||
|
||||
public virtual bool CanRotate {
|
||||
get {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
public virtual void Rotate(RotateFlipType rotateFlipType) {
|
||||
// somehow the rotation is the wrong way?
|
||||
int angle = 90;
|
||||
|
|
|
@ -169,25 +169,13 @@ namespace Greenshot.Drawing {
|
|||
myBounds = Rectangle.Round(freehandPath.GetBounds());
|
||||
}
|
||||
|
||||
public override void Rotate(RotateFlipType rotateFlipType) {
|
||||
int angle = 270;
|
||||
if (rotateFlipType == RotateFlipType.Rotate90FlipNone) {
|
||||
angle = 90;
|
||||
/// <summary>
|
||||
/// Currently we can't rotate the freehand
|
||||
/// </summary>
|
||||
public override bool CanRotate {
|
||||
get {
|
||||
return false;
|
||||
}
|
||||
|
||||
LOG.DebugFormat("Bounds before: {0} - {1}", Bounds, freehandPath.GetBounds());
|
||||
Matrix rotateMatrix = new Matrix();
|
||||
rotateMatrix.Translate(-(parent.Width >> 1), -(parent.Height >> 1));
|
||||
freehandPath.Transform(rotateMatrix);
|
||||
rotateMatrix = new Matrix();
|
||||
rotateMatrix.Rotate(360 - angle);
|
||||
freehandPath.Transform(rotateMatrix);
|
||||
rotateMatrix = new Matrix();
|
||||
rotateMatrix.Translate(parent.Height >> 1, parent.Width >> 1);
|
||||
freehandPath.Transform(rotateMatrix);
|
||||
|
||||
LOG.DebugFormat("Bounds after: {0} - {1}", Bounds, freehandPath.GetBounds());
|
||||
//base.Rotate(rotateFlipType);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
@ -582,7 +582,9 @@ namespace Greenshot.Drawing {
|
|||
rotateFlipType = RotateFlipType.Rotate90FlipNone;
|
||||
}
|
||||
foreach (DrawableContainer drawableContainer in elements) {
|
||||
drawableContainer.Rotate(rotateFlipType);
|
||||
if (drawableContainer.CanRotate) {
|
||||
drawableContainer.Rotate(rotateFlipType);
|
||||
}
|
||||
}
|
||||
newImage = ImageHelper.RotateFlip((Bitmap)Image, rotateFlipType);
|
||||
break;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue