diff --git a/src/Avalonia.Base/Media/DashStyle.cs b/src/Avalonia.Base/Media/DashStyle.cs index 338737d2ab..4749bfa401 100644 --- a/src/Avalonia.Base/Media/DashStyle.cs +++ b/src/Avalonia.Base/Media/DashStyle.cs @@ -46,7 +46,7 @@ namespace Avalonia.Media /// The dash sequence offset. public DashStyle(IEnumerable? dashes, double offset) { - SetCurrentValue(DashesProperty, (dashes as AvaloniaList) ?? new AvaloniaList(dashes ?? Array.Empty())); + Dashes = (dashes as AvaloniaList) ?? new AvaloniaList(dashes ?? Array.Empty()); Offset = offset; } diff --git a/src/Avalonia.Base/Media/GradientBrush.cs b/src/Avalonia.Base/Media/GradientBrush.cs index 0ec753201a..e1654a01b2 100644 --- a/src/Avalonia.Base/Media/GradientBrush.cs +++ b/src/Avalonia.Base/Media/GradientBrush.cs @@ -40,7 +40,7 @@ namespace Avalonia.Media /// public GradientBrush() { - SetCurrentValue(GradientStopsProperty, new GradientStops()); + this.GradientStops = new GradientStops(); } /// diff --git a/src/Avalonia.Base/Media/PolyLineSegment.cs b/src/Avalonia.Base/Media/PolyLineSegment.cs index 7de5e1afa5..5c48c11e19 100644 --- a/src/Avalonia.Base/Media/PolyLineSegment.cs +++ b/src/Avalonia.Base/Media/PolyLineSegment.cs @@ -30,7 +30,7 @@ namespace Avalonia.Media /// public PolyLineSegment() { - SetCurrentValue(PointsProperty, new Points()); + Points = new Points(); } /// diff --git a/src/Avalonia.Base/Media/TransformGroup.cs b/src/Avalonia.Base/Media/TransformGroup.cs index c048234f8c..0465efd5a5 100644 --- a/src/Avalonia.Base/Media/TransformGroup.cs +++ b/src/Avalonia.Base/Media/TransformGroup.cs @@ -13,16 +13,15 @@ namespace Avalonia.Media public TransformGroup() { - var children = new Transforms(); - children.ResetBehavior = ResetBehavior.Remove; - children.CollectionChanged += delegate + 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) diff --git a/src/Avalonia.Controls/Calendar/CalendarButton.cs b/src/Avalonia.Controls/Calendar/CalendarButton.cs index b35298b101..d8672cbf18 100644 --- a/src/Avalonia.Controls/Calendar/CalendarButton.cs +++ b/src/Avalonia.Controls/Calendar/CalendarButton.cs @@ -39,7 +39,7 @@ namespace Avalonia.Controls.Primitives public CalendarButton() : base() { - SetCurrentValue(ContentProperty, DateTimeHelper.GetCurrentDateFormat().AbbreviatedMonthNames[0]); + Content = DateTimeHelper.GetCurrentDateFormat().AbbreviatedMonthNames[0]; } /// diff --git a/src/Avalonia.Controls/Calendar/CalendarDayButton.cs b/src/Avalonia.Controls/Calendar/CalendarDayButton.cs index ea3ca8e8fc..3d0befdba7 100644 --- a/src/Avalonia.Controls/Calendar/CalendarDayButton.cs +++ b/src/Avalonia.Controls/Calendar/CalendarDayButton.cs @@ -34,7 +34,7 @@ namespace Avalonia.Controls.Primitives : base() { //Focusable = false; - SetCurrentValue(ContentProperty, DefaultContent.ToString(CultureInfo.CurrentCulture)); + Content = DefaultContent.ToString(CultureInfo.CurrentCulture); } /// diff --git a/src/Avalonia.Controls/Documents/Span.cs b/src/Avalonia.Controls/Documents/Span.cs index a4f3264c4d..d3565cbdd5 100644 --- a/src/Avalonia.Controls/Documents/Span.cs +++ b/src/Avalonia.Controls/Documents/Span.cs @@ -20,10 +20,10 @@ namespace Avalonia.Controls.Documents public Span() { - SetCurrentValue(InlinesProperty, new InlineCollection + Inlines = new InlineCollection { LogicalChildren = LogicalChildren - }); + }; } /// diff --git a/src/Avalonia.Controls/GridSplitter.cs b/src/Avalonia.Controls/GridSplitter.cs index 50d1004f34..4684304725 100644 --- a/src/Avalonia.Controls/GridSplitter.cs +++ b/src/Avalonia.Controls/GridSplitter.cs @@ -707,7 +707,7 @@ namespace Avalonia.Controls RenderTransform = _translation }; - SetCurrentValue(ChildProperty, _decorator); + Child = _decorator; } /// diff --git a/src/Avalonia.Controls/LayoutTransformControl.cs b/src/Avalonia.Controls/LayoutTransformControl.cs index 02d2eeef5b..06069a897e 100644 --- a/src/Avalonia.Controls/LayoutTransformControl.cs +++ b/src/Avalonia.Controls/LayoutTransformControl.cs @@ -176,7 +176,7 @@ namespace Avalonia.Controls else { _renderTransformChangedEvent?.Dispose(); - SetCurrentValue(LayoutTransformProperty, null); + ClearValue(LayoutTransformProperty); } } } diff --git a/src/Avalonia.Controls/NativeMenuItemSeparator.cs b/src/Avalonia.Controls/NativeMenuItemSeparator.cs index 55b3fd08de..f55d714884 100644 --- a/src/Avalonia.Controls/NativeMenuItemSeparator.cs +++ b/src/Avalonia.Controls/NativeMenuItemSeparator.cs @@ -4,7 +4,7 @@ { public NativeMenuItemSeparator() { - SetCurrentValue(HeaderProperty, "-"); + Header = "-"; } } } diff --git a/src/Avalonia.Controls/Primitives/OverlayPopupHost.cs b/src/Avalonia.Controls/Primitives/OverlayPopupHost.cs index 0acc488885..7ed055f2e5 100644 --- a/src/Avalonia.Controls/Primitives/OverlayPopupHost.cs +++ b/src/Avalonia.Controls/Primitives/OverlayPopupHost.cs @@ -31,7 +31,7 @@ namespace Avalonia.Controls.Primitives /// public void SetChild(Control? control) { - SetCurrentValue(ContentProperty, control); + Content = control; } /// diff --git a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs index ac3e87c03d..663a315732 100644 --- a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs +++ b/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 - SetCurrentValue(SelectedValueProperty, SelectedItem); + SelectedValue = SelectedItem; return; } @@ -721,7 +721,7 @@ namespace Avalonia.Controls.Primitives } // Re-evaluate SelectedValue with the new binding - SetCurrentValue(SelectedValueProperty, _bindingHelper.Evaluate(selectedItem)); + SelectedValue = _bindingHelper.Evaluate(selectedItem); } finally { @@ -1092,7 +1092,7 @@ namespace Avalonia.Controls.Primitives try { _isSelectionChangeActive = true; - SetCurrentValue(SelectedValueProperty, item); + SelectedValue = item; } finally { @@ -1106,7 +1106,7 @@ namespace Avalonia.Controls.Primitives try { _isSelectionChangeActive = true; - SetCurrentValue(SelectedValueProperty, _bindingHelper.Evaluate(item)); + SelectedValue = _bindingHelper.Evaluate(item); } finally { diff --git a/src/Avalonia.Controls/PullToRefresh/RefreshVisualizer.cs b/src/Avalonia.Controls/PullToRefresh/RefreshVisualizer.cs index 45227eef77..0ee2d69a73 100644 --- a/src/Avalonia.Controls/PullToRefresh/RefreshVisualizer.cs +++ b/src/Avalonia.Controls/PullToRefresh/RefreshVisualizer.cs @@ -193,7 +193,7 @@ namespace Avalonia.Controls UpdateContent(); }; - SetCurrentValue(ContentProperty, _content); + Content = _content; } else { diff --git a/src/Avalonia.Controls/TabControl.cs b/src/Avalonia.Controls/TabControl.cs index 2e27cfd123..310dd34382 100644 --- a/src/Avalonia.Controls/TabControl.cs +++ b/src/Avalonia.Controls/TabControl.cs @@ -164,8 +164,8 @@ namespace Avalonia.Controls if (index == SelectedIndex && element is ContentControl container) { - SetCurrentValue(SelectedContentTemplateProperty, container.ContentTemplate); - SetCurrentValue(SelectedContentProperty, container.Content); + SelectedContentTemplate = container.ContentTemplate; + SelectedContent = container.Content; } } @@ -189,15 +189,14 @@ namespace Avalonia.Controls { if (SelectedIndex == -1) { - SetCurrentValue(SelectedContentProperty, null); - SetCurrentValue(SelectedContentTemplateProperty, null); + SelectedContent = SelectedContentTemplate = null; } else { var container = SelectedItem as IContentControl ?? ContainerFromIndex(SelectedIndex) as IContentControl; - SetCurrentValue(SelectedContentTemplateProperty, container?.ContentTemplate); - SetCurrentValue(SelectedContentProperty, container?.Content); + SelectedContentTemplate = container?.ContentTemplate; + SelectedContent = container?.Content; } } diff --git a/src/Avalonia.Controls/TabItem.cs b/src/Avalonia.Controls/TabItem.cs index 60e9a7c88c..4068404952 100644 --- a/src/Avalonia.Controls/TabItem.cs +++ b/src/Avalonia.Controls/TabItem.cs @@ -68,14 +68,14 @@ namespace Avalonia.Controls { if (Header != headered.Header) { - SetCurrentValue(HeaderProperty, headered.Header); + Header = headered.Header; } } else { if (!(obj.NewValue is Control)) { - SetCurrentValue(HeaderProperty, obj.NewValue); + Header = obj.NewValue; } } } @@ -83,7 +83,7 @@ namespace Avalonia.Controls { if (Header == obj.OldValue) { - SetCurrentValue(HeaderProperty, obj.NewValue); + Header = obj.NewValue; } } }