github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-19 13:10:00 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed some calculations

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2386 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-12-17 10:50:26 +00:00
commit 86dc1fa60d
1 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Greenshot/Forms/ResizeSettingsForm.cs
View file

@ -25,11 +25,14 @@ using Greenshot.Core;
using GreenshotPlugin.Core; using GreenshotPlugin.Core;
namespace Greenshot.Forms { namespace Greenshot.Forms {
/// <summary>
/// A form to set the resize settings
/// </summary>
public partial class ResizeSettingsForm : BaseForm { public partial class ResizeSettingsForm : BaseForm {
private ResizeEffect effect; private ResizeEffect effect;
private string value_pixel; private string value_pixel;
private string value_percent; private string value_percent;
private int newWidth, newHeight; private double newWidth, newHeight;
public ResizeSettingsForm(ResizeEffect effect) { public ResizeSettingsForm(ResizeEffect effect) {
this.effect = effect; this.effect = effect;
@ -56,8 +59,8 @@ namespace Greenshot.Forms {
private void buttonOK_Click(object sender, EventArgs e) { private void buttonOK_Click(object sender, EventArgs e) {
if (newWidth != effect.Width || newHeight != effect.Height) { if (newWidth != effect.Width || newHeight != effect.Height) {
effect.Width = newWidth; effect.Width = (int)newWidth;
effect.Height = newHeight; effect.Height = (int)newHeight;
effect.MaintainAspectRatio = checkbox_aspectratio.Checked; effect.MaintainAspectRatio = checkbox_aspectratio.Checked;
DialogResult = DialogResult.OK; DialogResult = DialogResult.OK;
} }
@ -78,22 +81,23 @@ namespace Greenshot.Forms {
} }
private void displayWidth() { private void displayWidth() {
int displayValue; double displayValue;
if (value_percent.Equals(combobox_width.SelectedItem)) { if (value_percent.Equals(combobox_width.SelectedItem)) {
displayValue = (int)(((double)newWidth / (double)effect.Width) * 100); displayValue = ((double)newWidth / (double)effect.Width) * 100d;
} else { } else {
displayValue = newWidth; displayValue = newWidth;
} }
textbox_width.Text = displayValue.ToString(); textbox_width.Text = ((int)displayValue).ToString();
} }
private void displayHeight() { private void displayHeight() {
int displayValue; double displayValue;
if (value_percent.Equals(combobox_height.SelectedItem)) { if (value_percent.Equals(combobox_height.SelectedItem)) {
displayValue = (int)(((double)newHeight / (double)effect.Height) * 100); displayValue = ((double)newHeight / (double)effect.Height) * 100d;
} else { } else {
displayValue = newHeight; displayValue = newHeight;
} }
textbox_height.Text = displayValue.ToString(); textbox_height.Text = ((int)displayValue).ToString();
} }
private void textbox_KeyUp(object sender, KeyEventArgs e) { private void textbox_KeyUp(object sender, KeyEventArgs e) {
@ -117,26 +121,26 @@ namespace Greenshot.Forms {
double percent; double percent;
if (isWidth) { if (isWidth) {
if (isPercent) { if (isPercent) {
percent = float.Parse(textbox_width.Text); percent = double.Parse(textbox_width.Text);
newWidth = (int)(((double)effect.Width / 100d) * percent); newWidth = ((double)effect.Width / 100d) * percent;
} else { } else {
newWidth = int.Parse(textbox_width.Text); newWidth = double.Parse(textbox_width.Text);
percent = ((double)double.Parse(textbox_width.Text) / (double)effect.Width) * 100d; percent = ((double)double.Parse(textbox_width.Text) / (double)effect.Width) * 100d;
} }
if (checkbox_aspectratio.Checked) { if (checkbox_aspectratio.Checked) {
newHeight = (int)(((double)effect.Height / 100d) * percent); newHeight = ((double)effect.Height / 100d) * percent;
displayHeight(); displayHeight();
} }
} else { } else {
if (isPercent) { if (isPercent) {
percent = int.Parse(textbox_height.Text); percent = double.Parse(textbox_height.Text);
newHeight = (int)(((double)effect.Height / 100d) * percent); newHeight = ((double)effect.Height / 100d) * percent;
} else { } else {
newHeight = int.Parse(textbox_height.Text); newHeight = double.Parse(textbox_height.Text);
percent = ((double)double.Parse(textbox_height.Text) / (double)effect.Height) * 100d; percent = ((double)double.Parse(textbox_height.Text) / (double)effect.Height) * 100d;
} }
if (checkbox_aspectratio.Checked) { if (checkbox_aspectratio.Checked) {
newWidth = (int)(((double)effect.Width / 100d) * percent); newWidth = ((double)effect.Width / 100d) * percent;
displayWidth(); displayWidth();
} }
} }