From a9cb1e2497a3104ecdd34318842821e67723aa68 Mon Sep 17 00:00:00 2001 From: Takoooooo Date: Fri, 5 Aug 2022 14:56:16 +0300 Subject: [PATCH] Address review. --- .../Converters/StringFormatConverter.cs | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/Avalonia.Controls/Converters/StringFormatConverter.cs b/src/Avalonia.Controls/Converters/StringFormatConverter.cs index 7075d3de99..82e75d9c34 100644 --- a/src/Avalonia.Controls/Converters/StringFormatConverter.cs +++ b/src/Avalonia.Controls/Converters/StringFormatConverter.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Globalization; +using System.Linq; using Avalonia.Data.Converters; namespace Avalonia.Controls.Converters; @@ -13,19 +14,11 @@ public class StringFormatConverter : IMultiValueConverter { public object? Convert(IList values, Type targetType, object? parameter, CultureInfo culture) { - if (values != null && - values.Count == 5 && - values[0] is string format && - values[1] is double && - values[2] is double && - values[3] is double && - values[4] is double) - + if (values[0] is string format) { - try { - return string.Format(format, values[1], values[2], values[3], values[4]); + return string.Format(format, values.Skip(1).ToArray()); } catch {