CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-24 17:20:58 +12:00
Code Issues Packages Projects Releases Wiki Activity

Small changes to resize

Browse source
This commit is contained in:
Jaex 2017-01-12 12:18:17 +03:00
parent c9116cc3db
commit 2fac39d779
4 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ShareX.HelpersLib/Enums.cs
View file

@ -167,14 +167,4 @@ public enum HotkeyStatus
Failed,
NotConfigured
}
public enum ResizeMode
{
[Description("Resizes all images to the specified size.")]
ResizeAll,
[Description("Only resize image if it is bigger than specified size.")]
ResizeIfBigger,
[Description("Only resize image if it is smaller than specified size.")]
ResizeIfSmaller
}
}

12
ShareX.ImageEffectsLib/Enums.cs
View file

@ -23,6 +23,8 @@
#endregion License Information (GPL v3)
using System.ComponentModel;
namespace ShareX.ImageEffectsLib
{
public enum WatermarkType
@ -30,4 +32,14 @@ public enum WatermarkType
Text,
Image
}
public enum ResizeMode
{
[Description("Resizes all images to the specified size.")]
ResizeAll,
[Description("Only resize image if it is bigger than specified size.")]
ResizeIfBigger,
[Description("Only resize image if it is smaller than specified size.")]
ResizeIfSmaller
}
}

11
ShareX.ImageEffectsLib/Manipulations/Resize.cs
View file

@ -37,8 +37,8 @@ public class Resize : ImageEffect
[DefaultValue(0), Description("Use height as 0 to automatically adjust height to maintain aspect ratio.")]
public int Height { get; set; }
[DefaultValue(ResizeMode.ResizeAll)]
public ResizeMode Mode { get; set; }
[DefaultValue(ResizeMode.ResizeAll)]
public ResizeMode Mode { get; set; }
public Resize()
{
@ -52,8 +52,11 @@ public override Image Apply(Image img)
int width = Width <= 0 ? (int)((float)Height / img.Height * img.Width) : Width;
int height = Height <= 0 ? (int)((float)Width / img.Width * img.Height) : Height;
if (Mode == ResizeMode.ResizeIfBigger && img.Width <= width && img.Height <= height) return img;
if (Mode == ResizeMode.ResizeIfSmaller && img.Width >= width && img.Height >= height) return img;
if ((Mode == ResizeMode.ResizeIfBigger && img.Width <= width && img.Height <= height) ||
(Mode == ResizeMode.ResizeIfSmaller && img.Width >= width && img.Height >= height))
{
return img;
}
return ImageHelpers.ResizeImage(img, width, height);
}

2
ShareX/ImageTag.cs
View file

@ -2,7 +2,7 @@
/*
ShareX - A program that allows you to take screenshots and share any file type
Copyright (c) 2007-2016 ShareX Team
Copyright (c) 2007-2017 ShareX Team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License