From f6f65f7ef0205c77f4bf1f6a98d7e0ba9c5e3a5c Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 31 Oct 2022 21:46:03 +0100 Subject: [PATCH] Color gradient editor - Fixed deleting stops with the X-button --- .../Controls/GradientPicker/GradientPicker.cs | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/Artemis.UI.Shared/Controls/GradientPicker/GradientPicker.cs b/src/Artemis.UI.Shared/Controls/GradientPicker/GradientPicker.cs index 0066ad760..5bc9eebd5 100644 --- a/src/Artemis.UI.Shared/Controls/GradientPicker/GradientPicker.cs +++ b/src/Artemis.UI.Shared/Controls/GradientPicker/GradientPicker.cs @@ -87,12 +87,12 @@ public class GradientPicker : TemplatedControl if (ColorGradient.Count <= 2) return; - int index = ColorGradient.IndexOf(s); - ColorGradient.Remove(s); - if (index > ColorGradient.Count - 1) + int index = EditingColorGradient.IndexOf(s); + EditingColorGradient.Remove(s); + if (index > EditingColorGradient.Count - 1) index--; - SelectedColorStop = ColorGradient.ElementAtOrDefault(index); + SelectedColorStop = EditingColorGradient.ElementAtOrDefault(index); }); } @@ -309,13 +309,8 @@ public class GradientPicker : TemplatedControl if (e.Key != Key.Delete || SelectedColorStop == null || EditingColorGradient.Count <= 2) return; - - int index = EditingColorGradient.IndexOf(SelectedColorStop); - EditingColorGradient.Remove(SelectedColorStop); - if (index > EditingColorGradient.Count - 1) - index--; - - SelectedColorStop = EditingColorGradient.ElementAtOrDefault(index); + + DeleteStop.Execute(SelectedColorStop); e.Handled = true; }