Code quality changes

This commit is contained in:
Robin 2016-09-22 20:40:13 +02:00
commit 610f45d082
189 changed files with 4609 additions and 5203 deletions

View file

@ -21,41 +21,41 @@
using System;
using System.Drawing;
using System.Windows.Forms;
using Greenshot.Core;
using GreenshotPlugin.Effects;
namespace Greenshot.Forms {
public partial class TornEdgeSettingsForm : BaseForm {
private readonly TornEdgeEffect effect;
private readonly TornEdgeEffect _effect;
public TornEdgeSettingsForm(TornEdgeEffect effect) {
this.effect = effect;
_effect = effect;
InitializeComponent();
ShowSettings();
}
private void ShowSettings() {
shadowCheckbox.Checked = effect.GenerateShadow;
shadowCheckbox.Checked = _effect.GenerateShadow;
// Fix to prevent BUG-1753
shadowDarkness.Value = Math.Max(shadowDarkness.Minimum, Math.Min(shadowDarkness.Maximum, (int)(effect.Darkness * shadowDarkness.Maximum)));
offsetX.Value = effect.ShadowOffset.X;
offsetY.Value = effect.ShadowOffset.Y;
toothsize.Value = effect.ToothHeight;
verticaltoothrange.Value = effect.VerticalToothRange;
horizontaltoothrange.Value = effect.HorizontalToothRange;
top.Checked = effect.Edges[0];
right.Checked = effect.Edges[1];
bottom.Checked = effect.Edges[2];
left.Checked = effect.Edges[3];
shadowDarkness.Value = Math.Max(shadowDarkness.Minimum, Math.Min(shadowDarkness.Maximum, (int)(_effect.Darkness * shadowDarkness.Maximum)));
offsetX.Value = _effect.ShadowOffset.X;
offsetY.Value = _effect.ShadowOffset.Y;
toothsize.Value = _effect.ToothHeight;
verticaltoothrange.Value = _effect.VerticalToothRange;
horizontaltoothrange.Value = _effect.HorizontalToothRange;
top.Checked = _effect.Edges[0];
right.Checked = _effect.Edges[1];
bottom.Checked = _effect.Edges[2];
left.Checked = _effect.Edges[3];
}
private void ButtonOK_Click(object sender, EventArgs e) {
effect.Darkness = (float)shadowDarkness.Value / (float)40;
effect.ShadowOffset = new Point((int)offsetX.Value, (int)offsetY.Value);
effect.ShadowSize = (int)thickness.Value;
effect.ToothHeight = (int)toothsize.Value;
effect.VerticalToothRange = (int)verticaltoothrange.Value;
effect.HorizontalToothRange = (int)horizontaltoothrange.Value;
effect.Edges = new bool[] { top.Checked, right.Checked, bottom.Checked, left.Checked };
effect.GenerateShadow = shadowCheckbox.Checked;
_effect.Darkness = shadowDarkness.Value / (float)40;
_effect.ShadowOffset = new Point((int)offsetX.Value, (int)offsetY.Value);
_effect.ShadowSize = (int)thickness.Value;
_effect.ToothHeight = (int)toothsize.Value;
_effect.VerticalToothRange = (int)verticaltoothrange.Value;
_effect.HorizontalToothRange = (int)horizontaltoothrange.Value;
_effect.Edges = new[] { top.Checked, right.Checked, bottom.Checked, left.Checked };
_effect.GenerateShadow = shadowCheckbox.Checked;
DialogResult = DialogResult.OK;
}
@ -66,37 +66,37 @@ namespace Greenshot.Forms {
shadowDarkness.Enabled = shadowCheckbox.Checked;
}
private void all_CheckedChanged(object sender, EventArgs e) {
AnySideChangeChecked(top, all.Checked);
AnySideChangeChecked(right, all.Checked);
AnySideChangeChecked(bottom, all.Checked);
AnySideChangeChecked(left, all.Checked);
}
private void all_CheckedChanged(object sender, EventArgs e) {
AnySideChangeChecked(top, all.Checked);
AnySideChangeChecked(right, all.Checked);
AnySideChangeChecked(bottom, all.Checked);
AnySideChangeChecked(left, all.Checked);
}
private void AnySideCheckedChanged(object sender, EventArgs e) {
all.CheckedChanged -= all_CheckedChanged;
all.Checked = top.Checked && right.Checked && bottom.Checked && left.Checked;
all.CheckedChanged += all_CheckedChanged;
}
private void AnySideCheckedChanged(object sender, EventArgs e) {
all.CheckedChanged -= all_CheckedChanged;
all.Checked = top.Checked && right.Checked && bottom.Checked && left.Checked;
all.CheckedChanged += all_CheckedChanged;
}
/// <summary>
/// changes the Checked property of top/right/bottom/left checkboxes without triggering AnySideCheckedChange
/// </summary>
/// <param name="cb">Checkbox to change Checked</param>
/// <param name="status">true to check</param>
private void AnySideChangeChecked(CheckBox cb, bool status) {
if (status != cb.Checked) {
cb.CheckedChanged -= AnySideCheckedChanged;
cb.Checked = status;
cb.CheckedChanged += AnySideCheckedChanged;
}
}
/// <summary>
/// changes the Checked property of top/right/bottom/left checkboxes without triggering AnySideCheckedChange
/// </summary>
/// <param name="cb">Checkbox to change Checked</param>
/// <param name="status">true to check</param>
private void AnySideChangeChecked(CheckBox cb, bool status) {
if (status != cb.Checked) {
cb.CheckedChanged -= AnySideCheckedChanged;
cb.Checked = status;
cb.CheckedChanged += AnySideCheckedChanged;
}
}
private void TornEdgeSettingsForm_Load(object sender, EventArgs e)
{
private void TornEdgeSettingsForm_Load(object sender, EventArgs e)
{
}
}
}
}