Browse Source

Revert some of SetCurrentValue

This reverts commit ead92a6122.
pull/11029/head
Max Katz 3 years ago
parent
commit
6523320a7b
  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. 4
      src/Avalonia.Controls/Documents/Span.cs
  8. 2
      src/Avalonia.Controls/GridSplitter.cs
  9. 2
      src/Avalonia.Controls/LayoutTransformControl.cs
  10. 2
      src/Avalonia.Controls/NativeMenuItemSeparator.cs
  11. 2
      src/Avalonia.Controls/Primitives/OverlayPopupHost.cs
  12. 8
      src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
  13. 2
      src/Avalonia.Controls/PullToRefresh/RefreshVisualizer.cs
  14. 11
      src/Avalonia.Controls/TabControl.cs
  15. 6
      src/Avalonia.Controls/TabItem.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)
{
SetCurrentValue(DashesProperty, (dashes as AvaloniaList<double>) ?? new AvaloniaList<double>(dashes ?? Array.Empty<double>()));
Dashes = (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()
{
SetCurrentValue(GradientStopsProperty, new GradientStops());
this.GradientStops = new GradientStops();
}
/// <inheritdoc/>

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

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

9
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)

2
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];
}
/// <summary>

2
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);
}
/// <summary>

4
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
});
};
}
/// <summary>

2
src/Avalonia.Controls/GridSplitter.cs

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

2
src/Avalonia.Controls/LayoutTransformControl.cs

@ -176,7 +176,7 @@ namespace Avalonia.Controls
else
{
_renderTransformChangedEvent?.Dispose();
SetCurrentValue(LayoutTransformProperty, null);
ClearValue(LayoutTransformProperty);
}
}
}

2
src/Avalonia.Controls/NativeMenuItemSeparator.cs

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

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

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

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

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

11
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;
}
}

6
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;
}
}
}

Loading…
Cancel
Save