From 4524e2511e1b0aa65ef74c0acde74a9c8c9d487f Mon Sep 17 00:00:00 2001 From: Nathan Brown Date: Tue, 14 Mar 2023 19:51:56 -0700 Subject: [PATCH] Revert "Remove unused parameters" This reverts commit 1d862d6f9fc8690fd121d54fe8770b10755be75f. --- src/Greenshot.Editor/Drawing/EllipseContainer.cs | 5 +++-- src/Greenshot.Editor/Drawing/StepLabelContainer.cs | 2 +- src/Greenshot.Editor/Drawing/Surface.cs | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Greenshot.Editor/Drawing/EllipseContainer.cs b/src/Greenshot.Editor/Drawing/EllipseContainer.cs index 927e4ae77..c421515d9 100644 --- a/src/Greenshot.Editor/Drawing/EllipseContainer.cs +++ b/src/Greenshot.Editor/Drawing/EllipseContainer.cs @@ -74,7 +74,7 @@ namespace Greenshot.Editor.Drawing Color fillColor = GetFieldValueAsColor(FieldType.FILL_COLOR); bool shadow = GetFieldValueAsBool(FieldType.SHADOW); var rect = new NativeRect(Left, Top, Width, Height).Normalize(); - DrawEllipse(rect, graphics, lineThickness, lineColor, fillColor, shadow); + DrawEllipse(rect, graphics, renderMode, lineThickness, lineColor, fillColor, shadow); } /// @@ -82,11 +82,12 @@ namespace Greenshot.Editor.Drawing /// /// /// + /// /// /// /// /// - 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); // draw shadow before anything else diff --git a/src/Greenshot.Editor/Drawing/StepLabelContainer.cs b/src/Greenshot.Editor/Drawing/StepLabelContainer.cs index 10d4d1710..e5d93e514 100644 --- a/src/Greenshot.Editor/Drawing/StepLabelContainer.cs +++ b/src/Greenshot.Editor/Drawing/StepLabelContainer.cs @@ -202,7 +202,7 @@ namespace Greenshot.Editor.Drawing } 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; diff --git a/src/Greenshot.Editor/Drawing/Surface.cs b/src/Greenshot.Editor/Drawing/Surface.cs index 4be43ca33..8ec5f4a3e 100644 --- a/src/Greenshot.Editor/Drawing/Surface.cs +++ b/src/Greenshot.Editor/Drawing/Surface.cs @@ -2136,7 +2136,7 @@ namespace Greenshot.Editor.Drawing } else { - ConfirmSelectedConfirmableElements(); + ConfirmSelectedConfirmableElements(confirm); } } @@ -2147,7 +2147,7 @@ namespace Greenshot.Editor.Drawing /// For crop-container there is a dedicated method . /// /// bool - public void ConfirmSelectedConfirmableElements() + public void ConfirmSelectedConfirmableElements(bool confirm) { // create new collection so that we can iterate safely (selectedElements might change due with confirm/cancel) List selectedDCs = new List(selectedElements);