Browse Source

Use more consistent naming.

pull/9677/head
Steven Kirk 4 years ago
parent
commit
c99307c6fa
  1. 2
      src/Avalonia.Controls/Generators/ItemContainerGenerator.cs
  2. 2
      src/Avalonia.Controls/ItemsControl.cs
  3. 2
      src/Avalonia.Controls/ListBox.cs
  4. 2
      src/Avalonia.Controls/TabControl.cs
  5. 2
      src/Avalonia.Controls/TreeView.cs
  6. 2
      src/Avalonia.Controls/TreeViewItem.cs
  7. 2
      tests/Avalonia.Controls.UnitTests/TreeViewTests.cs

2
src/Avalonia.Controls/Generators/ItemContainerGenerator.cs

@ -27,7 +27,7 @@ namespace Avalonia.Controls.Generators
/// calling this method, <see cref="PrepareItemContainer(Control, object, int)"/> should
/// be called to prepare the container to display the specified item.
/// </remarks>
public Control CreateContainer() => _owner.CreateContainerOverride();
public Control CreateContainer() => _owner.CreateContainerForItemOverride();
/// <summary>
/// Determines whether the specified item is (or is eligible to be) its own container.

2
src/Avalonia.Controls/ItemsControl.cs

@ -265,7 +265,7 @@ namespace Avalonia.Controls
/// <summary>
/// Creates or a container that can be used to display an item.
/// </summary>
protected internal virtual Control CreateContainerOverride() => new ContentPresenter();
protected internal virtual Control CreateContainerForItemOverride() => new ContentPresenter();
/// <summary>
/// Prepares the specified element to display the specified item.

2
src/Avalonia.Controls/ListBox.cs

@ -103,7 +103,7 @@ namespace Avalonia.Controls
/// </summary>
public void UnselectAll() => Selection.Clear();
protected internal override Control CreateContainerOverride() => new ListBoxItem();
protected internal override Control CreateContainerForItemOverride() => new ListBoxItem();
/// <inheritdoc/>
protected override void OnGotFocus(GotFocusEventArgs e)

2
src/Avalonia.Controls/TabControl.cs

@ -149,7 +149,7 @@ namespace Avalonia.Controls
return RegisterContentPresenter(presenter);
}
protected internal override Control CreateContainerOverride() => new TabItem();
protected internal override Control CreateContainerForItemOverride() => new TabItem();
protected internal override bool IsItemItsOwnContainerOverride(Control item) => item is TabItem;
protected internal override void PrepareContainerForItemOverride(Control element, object? item, int index)

2
src/Avalonia.Controls/TreeView.cs

@ -465,7 +465,7 @@ namespace Avalonia.Controls
return (false, null);
}
protected internal override Control CreateContainerOverride() => new TreeViewItem();
protected internal override Control CreateContainerForItemOverride() => new TreeViewItem();
protected internal override bool IsItemItsOwnContainerOverride(Control item) => item is TreeViewItem;
/// <inheritdoc/>

2
src/Avalonia.Controls/TreeViewItem.cs

@ -90,7 +90,7 @@ namespace Avalonia.Controls
internal TreeView? TreeViewOwner => _treeView;
protected internal override Control CreateContainerOverride() => new TreeViewItem();
protected internal override Control CreateContainerForItemOverride() => new TreeViewItem();
protected internal override bool IsItemItsOwnContainerOverride(Control item) => item is TreeViewItem;
/// <inheritdoc/>

2
tests/Avalonia.Controls.UnitTests/TreeViewTests.cs

@ -1406,7 +1406,7 @@ namespace Avalonia.Controls.UnitTests
private class DerivedTreeViewWithDerivedTreeViewItems : TreeView
{
protected internal override Control CreateContainerOverride() => new DerivedTreeViewItem();
protected internal override Control CreateContainerForItemOverride() => new DerivedTreeViewItem();
}
private class DerivedTreeViewItem : TreeViewItem

Loading…
Cancel
Save