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

Fix boxes and circles drawing.

Browse source
This commit is contained in:
Vladimir Poleh 2020-01-11 01:06:00 +03:00
commit 5e0cb799bd
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/Greenshot.Gfx/Legacy/ScaleHelper.cs
View file

@ -1,19 +1,19 @@
// Greenshot - a free and open source screenshot tool // Greenshot - a free and open source screenshot tool
// Copyright (C) 2007-2019 Thomas Braun, Jens Klingen, Robin Krom // Copyright (C) 2007-2019 Thomas Braun, Jens Klingen, Robin Krom
// //
// For more information see: http://getgreenshot.org/ // For more information see: http://getgreenshot.org/
// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot // The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
// //
// This program is free software: you can redistribute it and/or modify // This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 1 of the License, or // the Free Software Foundation, either version 1 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// This program is distributed in the hope that it will be useful, // This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
@ -30,7 +30,6 @@ namespace Greenshot.Gfx.Legacy
/// </summary> /// </summary>
public static partial class ScaleHelper public static partial class ScaleHelper
{ {
/// <summary> /// <summary>
/// calculates the Size an element must be resized to, in order to fit another element, keeping aspect ratio /// calculates the Size an element must be resized to, in order to fit another element, keeping aspect ratio
/// </summary> /// </summary>
@ -323,7 +322,7 @@ namespace Greenshot.Gfx.Legacy
} }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
/// <param name="boundsBeforeResize"></param> /// <param name="boundsBeforeResize"></param>
/// <param name="cursorX"></param> /// <param name="cursorX"></param>
@ -335,7 +334,7 @@ namespace Greenshot.Gfx.Legacy
} }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
/// <param name="boundsBeforeResize"></param> /// <param name="boundsBeforeResize"></param>
/// <param name="cursorX"></param> /// <param name="cursorX"></param>
@ -348,7 +347,7 @@ namespace Greenshot.Gfx.Legacy
} }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
/// <param name="boundsBeforeResize"></param> /// <param name="boundsBeforeResize"></param>
/// <param name="gripperPosition"></param> /// <param name="gripperPosition"></param>
@ -377,12 +376,16 @@ namespace Greenshot.Gfx.Legacy
boundsAfterResize = boundsAfterResize.Resize((float)Math.Round(dist * Math.Cos(angle / 180 * Math.PI)), (float)Math.Round(dist * Math.Sin(angle / 180 * Math.PI))); boundsAfterResize = boundsAfterResize.Resize((float)Math.Round(dist * Math.Cos(angle / 180 * Math.PI)), (float)Math.Round(dist * Math.Sin(angle / 180 * Math.PI)));
} }
else
{
boundsAfterResize = boundsAfterResize.Resize(cursorX - boundsBeforeResize.Left, cursorY - boundsBeforeResize.Top);
}
if (centeredScale) if (centeredScale)
{ {
var wdiff = boundsAfterResize.Width - boundsBeforeResize.Width; var wdiff = boundsAfterResize.Width - boundsBeforeResize.Width;
var hdiff = boundsAfterResize.Height - boundsBeforeResize.Height; var hdiff = boundsAfterResize.Height - boundsBeforeResize.Height;
boundsAfterResize = boundsAfterResize.Offset(-wdiff, -hdiff).Resize(boundsAfterResize.Width + wdiff, boundsAfterResize.Height + hdiff); boundsAfterResize = boundsAfterResize.Offset(-wdiff, -hdiff).Resize(boundsAfterResize.Width + wdiff, boundsAfterResize.Height + hdiff);
} }
} }