Skip to content

Grid Shorthand Syntax Implementation #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
himgoyalmicro wants to merge 8 commits into
base: release/9.0
Choose a base branch
from
Open

Grid Shorthand Syntax Implementation #6

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7a5aa07
Grid Shorthand Syntax Implementation
himgoyalmicro Nov 25, 2024
61376b0
Creating an internal property Owner for CDC
himgoyalmicro Nov 29, 2024
5cab537
Removing ConvertTo Method in CDCConverter
himgoyalmicro Dec 3, 2024
f14d5e3
Adding Owner Check
himgoyalmicro Dec 3, 2024
56975ef
Nit change
himgoyalmicro Dec 3, 2024
f4f03c8
Updated to allow the 'owner' property to be set to null
himgoyalmicro Dec 4, 2024
3af704d
Adding the changes to RowDefinitions
himgoyalmicro Dec 4, 2024
bd9984b
1. Adding Public Constructor to RowDefinitionCollection and ColumnDef…
himgoyalmicro Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion ...icrosoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/ColumnDefinition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,31 @@ internal void InternalTrimToSize()

#region Internal Properties

/// <summary>
/// Owner property.
/// </summary>
internal Grid Owner
{
get { return (_owner); }
set
{
if(_owner != null && _owner != value)
{
throw new ArgumentException(SR.Format(SR.GridCollection_InOtherCollection, "value", "ColumnDefinitionCollection"));
}
if(value == null)
{
return;
}
_owner = value;
for (int i = 0; i < _size; i++)
{
_owner.AddLogicalChild(_items[i]);
_items[i].OnEnterParentTree();
}
}
}

/// <summary>
/// Internal version of Count.
/// </summary>
Expand Down Expand Up @@ -742,7 +767,7 @@ private void PrivateSetCapacity(int value)
//------------------------------------------------------

#region Private Fields
private readonly Grid _owner; // owner of the collection
private Grid _owner; // owner of the collection
private DefinitionBase[] _items; // storage of items
private int _size; // size of the collection
private int _version; // version tracks updates in the collection
Expand Down
19 changes: 7 additions & 12 deletions src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Grid.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,21 +285,16 @@ public ColumnDefinitionCollection ColumnDefinitions
}
set
{
_data ??= new ExtendedData();
_data.ColumnDefinitions ??= new ColumnDefinitionCollection(this);
_data.ColumnDefinitions.Clear();
if (value == null)
if (value?.Owner is not null)
{
return;
throw new ArgumentException(SR.Format(SR.GridCollection_InOtherCollection, "value", "ColumnDefinitionCollection"));
}
foreach (ColumnDefinition colDef in value)
_data ??= new ExtendedData();
_data.ColumnDefinitions?.Clear();
if (value is not null)
{
if (colDef.Parent != null)
{
throw new ArgumentException(SR.Format(SR.GridCollection_InOtherCollection, "value", "ColumnDefinitionCollection"));
}
colDef.Index = -1;
_data.ColumnDefinitions.Add(colDef);
value.Owner = this;
_data.ColumnDefinitions = value;
}
}
}
Expand Down