Skip to content

Add internal methods in DataColumn #786

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
9rnsr wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add internal methods in DataColumn #786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions components/DataTable/src/DataTable/DataColumn.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ public partial class DataColumn : ContentControl

private WeakReference<DataTable>? _parent;

internal DataTable? DataTable => _parent?.TryGetTarget(out DataTable? parent) == true ? parent : null;

/// <summary>
/// Gets or sets the width of the largest child contained within the visible <see cref="DataRow"/>s of the <see cref="DataTable"/>.
/// </summary>
Expand All @@ -23,6 +25,12 @@ public partial class DataColumn : ContentControl
/// </summary>
internal GridLength CurrentWidth { get; private set; }

internal bool IsAbsolute => CurrentWidth.IsAbsolute;

internal bool IsAuto => CurrentWidth.IsAuto;

internal bool IsStar => CurrentWidth.IsStar;

/// <summary>
/// Gets or sets whether the column can be resized by the user.
/// </summary>
Expand Down Expand Up @@ -111,10 +119,6 @@ private void ColumnResizedByUserSizer()
CurrentWidth = new(this.ActualWidth);

// Notify the rest of the table to update
if (_parent?.TryGetTarget(out DataTable? parent) == true
&& parent != null)
{
parent.ColumnResized();
}
DataTable?.ColumnResized();
}
}
16 changes: 8 additions & 8 deletions components/DataTable/src/DataTable/DataTable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ protected override Size MeasureOverride(Size availableSize)
// We only need to measure elements that are visible
foreach (DataColumn column in elements)
{
if (column.CurrentWidth.IsStar)
if (column.IsStar)
{
proportionalUnits += column.DesiredWidth.Value;
}
else if (column.CurrentWidth.IsAbsolute)
else if (column.IsAbsolute)
{
fixedWidth += column.DesiredWidth.Value;
}
Expand All @@ -75,11 +75,11 @@ protected override Size MeasureOverride(Size availableSize)

foreach (DataColumn column in elements)
{
if (column.CurrentWidth.IsStar)
if (column.IsStar)
{
column.Measure(new Size(proportionalAmount * column.CurrentWidth.Value, availableSize.Height));
}
else if (column.CurrentWidth.IsAbsolute)
else if (column.IsAbsolute)
{
column.Measure(new Size(column.CurrentWidth.Value, availableSize.Height));
}
Expand Down Expand Up @@ -118,11 +118,11 @@ protected override Size ArrangeOverride(Size finalSize)
// We only need to measure elements that are visible
foreach (DataColumn column in elements)
{
if (column.CurrentWidth.IsStar)
if (column.IsStar)
{
proportionalUnits += column.CurrentWidth.Value;
}
else if (column.CurrentWidth.IsAbsolute)
else if (column.IsAbsolute)
{
fixedWidth += column.CurrentWidth.Value;
}
Expand All @@ -141,12 +141,12 @@ protected override Size ArrangeOverride(Size finalSize)

foreach (DataColumn column in elements)
{
if (column.CurrentWidth.IsStar)
if (column.IsStar)
{
width = proportionalAmount * column.CurrentWidth.Value;
column.Arrange(new Rect(x, 0, width, finalSize.Height));
}
else if (column.CurrentWidth.IsAbsolute)
else if (column.IsAbsolute)
{
width = column.CurrentWidth.Value;
column.Arrange(new Rect(x, 0, width, finalSize.Height));
Expand Down