github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-30 11:40:40 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Code quality fixes (NullReference checks, unused variables etc)

Browse source
This commit is contained in:
RKrom 2014-04-26 00:34:06 +02:00
parent 6ab6033f85
commit ac08533727
99 changed files with 1252 additions and 1312 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Greenshot/Helpers/ScaleHelper.cs
View file

@ -22,6 +22,7 @@ using System;
using System.Drawing;
using System.Windows.Forms;
using Greenshot.Drawing;
using log4net;
namespace Greenshot.Helpers {
/// <summary>
@ -45,7 +46,7 @@ namespace Greenshot.Helpers {
Rational = 0x02
}
private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(ScaleHelper));
private static readonly ILog LOG = LogManager.GetLogger(typeof(ScaleHelper));
/// <summary>
/// calculates the Size an element must be resized to, in order to fit another element, keeping aspect ratio
@ -289,10 +290,10 @@ namespace Greenshot.Helpers {
public static void Scale(Rectangle boundsBeforeResize, int gripperPosition, int cursorX, int cursorY, ref RectangleF boundsAfterResize, IDoubleProcessor angleRoundBehavior) {
ScaleHelper.ScaleOptions opts = ScaleHelper.GetScaleOptions();
ScaleOptions opts = GetScaleOptions();
bool rationalScale = (opts & ScaleHelper.ScaleOptions.Rational) == ScaleHelper.ScaleOptions.Rational;
bool centeredScale = (opts & ScaleHelper.ScaleOptions.Centered) == ScaleHelper.ScaleOptions.Centered;
bool rationalScale = (opts & ScaleOptions.Rational) == ScaleOptions.Rational;
bool centeredScale = (opts & ScaleOptions.Centered) == ScaleOptions.Centered;
if(rationalScale) {
double angle = GeometryHelper.Angle2D(boundsBeforeResize.X, boundsBeforeResize.Y, cursorX, cursorY);
@ -320,7 +321,7 @@ namespace Greenshot.Helpers {
}
/// <returns>the current ScaleOptions depending on modifier keys held down</returns>
public static ScaleHelper.ScaleOptions GetScaleOptions() {
public static ScaleOptions GetScaleOptions() {
bool anchorAtCenter = (Control.ModifierKeys & Keys.Control) != 0;
bool maintainAspectRatio = ((Control.ModifierKeys & Keys.Shift) != 0);
ScaleOptions opts = ScaleOptions.Default;
@ -353,7 +354,7 @@ namespace Greenshot.Helpers {
this.fixedAngle = fixedAngle;
}
public double Process(double angle) {
return this.fixedAngle;
return fixedAngle;
}
}