Browse Source

Address review.

pull/8663/head
Takoooooo 4 years ago
parent
commit
a9cb1e2497
  1. 13
      src/Avalonia.Controls/Converters/StringFormatConverter.cs

13
src/Avalonia.Controls/Converters/StringFormatConverter.cs

@ -1,6 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Linq;
using Avalonia.Data.Converters; using Avalonia.Data.Converters;
namespace Avalonia.Controls.Converters; namespace Avalonia.Controls.Converters;
@ -13,19 +14,11 @@ public class StringFormatConverter : IMultiValueConverter
{ {
public object? Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture) public object? Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture)
{ {
if (values != null && if (values[0] is string format)
values.Count == 5 &&
values[0] is string format &&
values[1] is double &&
values[2] is double &&
values[3] is double &&
values[4] is double)
{ {
try try
{ {
return string.Format(format, values[1], values[2], values[3], values[4]); return string.Format(format, values.Skip(1).ToArray());
} }
catch catch
{ {

Loading…
Cancel
Save