github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-21 14:03:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Remove unused parameters"

Browse source 
This reverts commit 1d862d6f9f.
This commit is contained in:
Nathan Brown 2023-03-14 19:51:56 -07:00
commit 4524e2511e
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Greenshot.Editor/Drawing/EllipseContainer.cs
View file

@ -74,7 +74,7 @@ namespace Greenshot.Editor.Drawing
Color fillColor = GetFieldValueAsColor(FieldType.FILL_COLOR); Color fillColor = GetFieldValueAsColor(FieldType.FILL_COLOR);
bool shadow = GetFieldValueAsBool(FieldType.SHADOW); bool shadow = GetFieldValueAsBool(FieldType.SHADOW);
var rect = new NativeRect(Left, Top, Width, Height).Normalize(); var rect = new NativeRect(Left, Top, Width, Height).Normalize();
DrawEllipse(rect, graphics, lineThickness, lineColor, fillColor, shadow); DrawEllipse(rect, graphics, renderMode, lineThickness, lineColor, fillColor, shadow);
} }
/// <summary> /// <summary>
@ -82,11 +82,12 @@ namespace Greenshot.Editor.Drawing
/// </summary> /// </summary>
/// <param name="rect"></param> /// <param name="rect"></param>
/// <param name="graphics"></param> /// <param name="graphics"></param>
/// <param name="renderMode"></param>
/// <param name="lineThickness"></param> /// <param name="lineThickness"></param>
/// <param name="lineColor"></param> /// <param name="lineColor"></param>
/// <param name="fillColor"></param> /// <param name="fillColor"></param>
/// <param name="shadow"></param> /// <param name="shadow"></param>
public static void DrawEllipse(NativeRect rect, Graphics graphics, int lineThickness, Color lineColor, Color fillColor, bool shadow) public static void DrawEllipse(NativeRect rect, Graphics graphics, RenderMode renderMode, int lineThickness, Color lineColor, Color fillColor, bool shadow)
{ {
bool lineVisible = lineThickness > 0 && Colors.IsVisible(lineColor); bool lineVisible = lineThickness > 0 && Colors.IsVisible(lineColor);
// draw shadow before anything else // draw shadow before anything else

2
src/Greenshot.Editor/Drawing/StepLabelContainer.cs
View file

@ -202,7 +202,7 @@ namespace Greenshot.Editor.Drawing
} }
else else
{ {
EllipseContainer.DrawEllipse(rect, graphics, 0, Color.Transparent, fillColor, false); EllipseContainer.DrawEllipse(rect, graphics, rm, 0, Color.Transparent, fillColor, false);
} }
float fontSize = Math.Min(Math.Abs(Width), Math.Abs(Height)) / 1.4f; float fontSize = Math.Min(Math.Abs(Width), Math.Abs(Height)) / 1.4f;

4
src/Greenshot.Editor/Drawing/Surface.cs
View file

@ -2136,7 +2136,7 @@ namespace Greenshot.Editor.Drawing
} }
else else
{ {
ConfirmSelectedConfirmableElements(); ConfirmSelectedConfirmableElements(confirm);
} }
} }
@ -2147,7 +2147,7 @@ namespace Greenshot.Editor.Drawing
/// For crop-container there is a dedicated method <see cref="ConfirmCrop(bool)"/>. /// For crop-container there is a dedicated method <see cref="ConfirmCrop(bool)"/>.
/// </summary> /// </summary>
/// <param name="confirm">bool</param> /// <param name="confirm">bool</param>
public void ConfirmSelectedConfirmableElements() public void ConfirmSelectedConfirmableElements(bool confirm)
{ {
// create new collection so that we can iterate safely (selectedElements might change due with confirm/cancel) // create new collection so that we can iterate safely (selectedElements might change due with confirm/cancel)
List<IDrawableContainer> selectedDCs = new List<IDrawableContainer>(selectedElements); List<IDrawableContainer> selectedDCs = new List<IDrawableContainer>(selectedElements);