Browse Source

Fix SetCurrentValue warnings

pull/11029/head
Max Katz 3 years ago
parent
commit
ead92a6122
  1. 2
      src/Avalonia.Base/Media/DashStyle.cs
  2. 2
      src/Avalonia.Base/Media/GradientBrush.cs
  3. 2
      src/Avalonia.Base/Media/PolyLineSegment.cs
  4. 9
      src/Avalonia.Base/Media/TransformGroup.cs
  5. 2
      src/Avalonia.Controls/Calendar/CalendarButton.cs
  6. 2
      src/Avalonia.Controls/Calendar/CalendarDayButton.cs
  7. 2
      src/Avalonia.Controls/ColumnDefinition.cs
  8. 4
      src/Avalonia.Controls/Documents/Span.cs
  9. 2
      src/Avalonia.Controls/GridSplitter.cs
  10. 4
      src/Avalonia.Controls/LayoutTransformControl.cs
  11. 2
      src/Avalonia.Controls/NativeMenuItemSeparator.cs
  12. 2
      src/Avalonia.Controls/Primitives/OverlayPopupHost.cs
  13. 8
      src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
  14. 2
      src/Avalonia.Controls/Primitives/UniformGrid.cs
  15. 2
      src/Avalonia.Controls/PullToRefresh/RefreshVisualizer.cs
  16. 4
      src/Avalonia.Controls/RowDefinition.cs
  17. 11
      src/Avalonia.Controls/TabControl.cs
  18. 8
      src/Avalonia.Controls/TabItem.cs
  19. 2
      src/Avalonia.Controls/ToggleSwitch.cs
  20. 4
      src/Avalonia.Diagnostics/Diagnostics/Controls/Application.cs

2
src/Avalonia.Base/Media/DashStyle.cs

@ -46,7 +46,7 @@ namespace Avalonia.Media
/// <param name="offset">The dash sequence offset.</param>
public DashStyle(IEnumerable<double>? dashes, double offset)
{
Dashes = (dashes as AvaloniaList<double>) ?? new AvaloniaList<double>(dashes ?? Array.Empty<double>());
SetCurrentValue(DashesProperty, (dashes as AvaloniaList<double>) ?? new AvaloniaList<double>(dashes ?? Array.Empty<double>()));
Offset = offset;
}

2
src/Avalonia.Base/Media/GradientBrush.cs

@ -40,7 +40,7 @@ namespace Avalonia.Media
/// </summary>
public GradientBrush()
{
this.GradientStops = new GradientStops();
SetCurrentValue(GradientStopsProperty, new GradientStops());
}
/// <inheritdoc/>

2
src/Avalonia.Base/Media/PolyLineSegment.cs

@ -30,7 +30,7 @@ namespace Avalonia.Media
/// </summary>
public PolyLineSegment()
{
Points = new Points();
SetCurrentValue(PointsProperty, new Points());
}
/// <summary>

9
src/Avalonia.Base/Media/TransformGroup.cs

@ -13,15 +13,16 @@ namespace Avalonia.Media
public TransformGroup()
{
Children = new Transforms();
Children.ResetBehavior = ResetBehavior.Remove;
Children.CollectionChanged += delegate
var children = new Transforms();
children.ResetBehavior = ResetBehavior.Remove;
children.CollectionChanged += delegate
{
Children.ForEachItem(
children.ForEachItem(
(tr) => tr.Changed += ChildTransform_Changed,
(tr) => tr.Changed -= ChildTransform_Changed,
() => { });
};
SetCurrentValue(ChildrenProperty, children);
}
private void ChildTransform_Changed(object? sender, System.EventArgs e)

2
src/Avalonia.Controls/Calendar/CalendarButton.cs

@ -39,7 +39,7 @@ namespace Avalonia.Controls.Primitives
public CalendarButton()
: base()
{
Content = DateTimeHelper.GetCurrentDateFormat().AbbreviatedMonthNames[0];
SetCurrentValue(ContentProperty, DateTimeHelper.GetCurrentDateFormat().AbbreviatedMonthNames[0]);
}
/// <summary>

2
src/Avalonia.Controls/Calendar/CalendarDayButton.cs

@ -34,7 +34,7 @@ namespace Avalonia.Controls.Primitives
: base()
{
//Focusable = false;
Content = DefaultContent.ToString(CultureInfo.CurrentCulture);
SetCurrentValue(ContentProperty, DefaultContent.ToString(CultureInfo.CurrentCulture));
}
/// <summary>

2
src/Avalonia.Controls/ColumnDefinition.cs

@ -46,8 +46,8 @@ namespace Avalonia.Controls
/// <param name="value">The width of the column.</param>
/// <param name="type">The width unit of the column.</param>
public ColumnDefinition(double value, GridUnitType type)
: this(new GridLength(value, type))
{
Width = new GridLength(value, type);
}
/// <summary>

4
src/Avalonia.Controls/Documents/Span.cs

@ -20,10 +20,10 @@ namespace Avalonia.Controls.Documents
public Span()
{
Inlines = new InlineCollection
SetCurrentValue(InlinesProperty, new InlineCollection
{
LogicalChildren = LogicalChildren
};
});
}
/// <summary>

2
src/Avalonia.Controls/GridSplitter.cs

@ -707,7 +707,7 @@ namespace Avalonia.Controls
RenderTransform = _translation
};
Child = _decorator;
SetCurrentValue(ChildProperty, _decorator);
}
/// <summary>

4
src/Avalonia.Controls/LayoutTransformControl.cs

@ -63,7 +63,7 @@ namespace Avalonia.Controls
{
if (TransformRoot == null || LayoutTransform == null)
{
LayoutTransform = RenderTransform;
SetCurrentValue(LayoutTransformProperty, RenderTransform);
return base.ArrangeOverride(finalSize);
}
@ -176,7 +176,7 @@ namespace Avalonia.Controls
else
{
_renderTransformChangedEvent?.Dispose();
LayoutTransform = null;
SetCurrentValue(LayoutTransformProperty, null);
}
}
}

2
src/Avalonia.Controls/NativeMenuItemSeparator.cs

@ -4,7 +4,7 @@
{
public NativeMenuItemSeparator()
{
Header = "-";
SetCurrentValue(HeaderProperty, "-");
}
}
}

2
src/Avalonia.Controls/Primitives/OverlayPopupHost.cs

@ -31,7 +31,7 @@ namespace Avalonia.Controls.Primitives
/// <inheritdoc />
public void SetChild(Control? control)
{
Content = control;
SetCurrentValue(ContentProperty, control);
}
/// <inheritdoc />

8
src/Avalonia.Controls/Primitives/SelectingItemsControl.cs

@ -701,7 +701,7 @@ namespace Avalonia.Controls.Primitives
if (value is null)
{
// Clearing SelectedValueBinding makes the SelectedValue the item itself
SelectedValue = SelectedItem;
SetCurrentValue(SelectedValueProperty, SelectedItem);
return;
}
@ -721,7 +721,7 @@ namespace Avalonia.Controls.Primitives
}
// Re-evaluate SelectedValue with the new binding
SelectedValue = _bindingHelper.Evaluate(selectedItem);
SetCurrentValue(SelectedValueProperty, _bindingHelper.Evaluate(selectedItem));
}
finally
{
@ -1092,7 +1092,7 @@ namespace Avalonia.Controls.Primitives
try
{
_isSelectionChangeActive = true;
SelectedValue = item;
SetCurrentValue(SelectedValueProperty, item);
}
finally
{
@ -1106,7 +1106,7 @@ namespace Avalonia.Controls.Primitives
try
{
_isSelectionChangeActive = true;
SelectedValue = _bindingHelper.Evaluate(item);
SetCurrentValue(SelectedValueProperty, _bindingHelper.Evaluate(item));
}
finally
{

2
src/Avalonia.Controls/Primitives/UniformGrid.cs

@ -123,7 +123,7 @@ namespace Avalonia.Controls.Primitives
if (FirstColumn >= Columns)
{
FirstColumn = 0;
SetCurrentValue(FirstColumnProperty, 0);
}
var itemCount = FirstColumn;

2
src/Avalonia.Controls/PullToRefresh/RefreshVisualizer.cs

@ -192,7 +192,7 @@ namespace Avalonia.Controls
UpdateContent();
};
Content = _content;
SetCurrentValue(ContentProperty, _content);
}
else
{

4
src/Avalonia.Controls/RowDefinition.cs

@ -46,8 +46,8 @@ namespace Avalonia.Controls
/// <param name="value">The height of the row.</param>
/// <param name="type">The height unit of the column.</param>
public RowDefinition(double value, GridUnitType type)
: this(new GridLength(value, type))
{
Height = new GridLength(value, type);
}
/// <summary>
@ -56,7 +56,7 @@ namespace Avalonia.Controls
/// <param name="height">The height of the column.</param>
public RowDefinition(GridLength height)
{
Height = height;
SetCurrentValue(HeightProperty, height);
}
/// <summary>

11
src/Avalonia.Controls/TabControl.cs

@ -162,8 +162,8 @@ namespace Avalonia.Controls
if (index == SelectedIndex && element is ContentControl container)
{
SelectedContentTemplate = container.ContentTemplate;
SelectedContent = container.Content;
SetCurrentValue(SelectedContentTemplateProperty, container.ContentTemplate);
SetCurrentValue(SelectedContentProperty, container.Content);
}
}
@ -187,14 +187,15 @@ namespace Avalonia.Controls
{
if (SelectedIndex == -1)
{
SelectedContent = SelectedContentTemplate = null;
SetCurrentValue(SelectedContentProperty, null);
SetCurrentValue(SelectedContentTemplateProperty, null);
}
else
{
var container = SelectedItem as IContentControl ??
ContainerFromIndex(SelectedIndex) as IContentControl;
SelectedContentTemplate = container?.ContentTemplate;
SelectedContent = container?.Content;
SetCurrentValue(SelectedContentTemplateProperty, container?.ContentTemplate);
SetCurrentValue(SelectedContentProperty, container?.Content);
}
}

8
src/Avalonia.Controls/TabItem.cs

@ -66,14 +66,14 @@ namespace Avalonia.Controls
{
if (Header != headered.Header)
{
Header = headered.Header;
SetCurrentValue(HeaderProperty, headered.Header);
}
}
else
{
if (!(obj.NewValue is Control))
{
Header = obj.NewValue;
SetCurrentValue(HeaderProperty, obj.NewValue);
}
}
}
@ -81,9 +81,9 @@ namespace Avalonia.Controls
{
if (Header == obj.OldValue)
{
Header = obj.NewValue;
SetCurrentValue(HeaderProperty, obj.NewValue);
}
}
}
}
}
}

2
src/Avalonia.Controls/ToggleSwitch.cs

@ -201,7 +201,7 @@ namespace Avalonia.Controls
}
else
{
IsChecked = shouldBecomeChecked;
SetCurrentValue(IsCheckedProperty, shouldBecomeChecked);
}
}
else

4
src/Avalonia.Diagnostics/Diagnostics/Controls/Application.cs

@ -37,7 +37,7 @@ namespace Avalonia.Diagnostics.Controls
_ => null
};
RequestedThemeVariant = application.RequestedThemeVariant;
SetCurrentValue(RequestedThemeVariantProperty, application.RequestedThemeVariant);
_application.PropertyChanged += ApplicationOnPropertyChanged;
}
@ -131,7 +131,7 @@ namespace Avalonia.Diagnostics.Controls
{
if (e.Property == Avalonia.Application.RequestedThemeVariantProperty)
{
RequestedThemeVariant = e.GetNewValue<ThemeVariant>();
SetCurrentValue(RequestedThemeVariantProperty, e.GetNewValue<ThemeVariant>());
}
}

Loading…
Cancel
Save