From 01f2a070cf2c4da88f52db60df2a3888d911686c Mon Sep 17 00:00:00 2001 From: Jumar Macato Date: Sat, 17 Nov 2018 16:50:50 +0800 Subject: [PATCH] DataGrid integration to Avalonia.Controls part 1 of N --- .../Collections/AvaloniaGroupDescription.cs | 1 + .../DataGrid}/Collections/AvaloniaSortDescription.cs | 0 .../DataGrid}/Collections/CollectionView.cs | 0 .../DataGrid}/Collections/ICollectionView.cs | 0 .../DataGrid}/DataGrid.cs | 0 .../DataGrid}/DataGridBoundColumn.cs | 0 .../DataGrid}/DataGridCell.cs | 0 .../DataGrid}/DataGridCellCollection.cs | 0 .../DataGrid}/DataGridCellCoordinates.cs | 0 .../DataGrid}/DataGridCheckBoxColumn.cs | 0 .../DataGrid}/DataGridClipboard.cs | 0 .../DataGrid}/DataGridColumn.cs | 0 .../DataGrid}/DataGridColumnCollection.cs | 0 .../DataGrid}/DataGridColumnHeader.cs | 0 .../DataGrid}/DataGridColumns.cs | 0 .../DataGrid}/DataGridDataConnection.cs | 0 .../DataGrid}/DataGridDisplayData.cs | 0 .../DataGrid}/DataGridEnumerations.cs | 0 .../DataGrid}/DataGridError.cs | 0 .../DataGrid}/DataGridFillerColumn.cs | 0 .../DataGrid}/DataGridLength.cs | 0 .../DataGrid}/DataGridRow.cs | 0 .../DataGrid}/DataGridRowGroupHeader.cs | 0 .../DataGrid}/DataGridRowGroupInfo.cs | 0 .../DataGrid}/DataGridRowHeader.cs | 0 .../DataGrid}/DataGridRows.cs | 0 .../DataGrid}/DataGridSelectedItemsCollection.cs | 0 .../DataGrid}/DataGridTemplateColumn.cs | 0 .../DataGrid}/DataGridTextColumn.cs | 0 .../DataGrid}/DataGridValueConverter.cs | 0 .../DataGrid}/EventArgs.cs | 0 .../DataGrid}/Extensions.cs | 0 .../DataGrid}/IndexToValueTable.cs | 0 .../DataGrid}/Range.cs | 0 .../Primitives/DataGridCellsPresenter.cs | 1 + .../Primitives/DataGridColumnHeadersPresenter.cs | 0 .../Primitives/DataGridDetailsPresenter.cs | 0 .../Primitives/DataGridFrozenGrid.cs | 0 .../Primitives/DataGridRowsPresenter.cs | 0 .../Utils}/CellEditBinding.cs | 12 ++++++------ .../Utils}/DoubleUtil.cs | 2 +- .../Utils}/KeyboardHelper.cs | 2 +- .../Utils}/ReflectionHelper.cs | 2 +- .../Utils}/TreeHelper.cs | 2 +- .../Utils}/ValidationUtil.cs | 2 +- src/Avalonia.DataGrid/Avalonia.DataGrid.csproj | 11 ----------- src/Avalonia.DataGrid/Properties/AssemblyInfo.cs | 8 -------- 47 files changed, 13 insertions(+), 30 deletions(-) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/Collections/AvaloniaGroupDescription.cs (99%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/Collections/AvaloniaSortDescription.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/Collections/CollectionView.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/Collections/ICollectionView.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/DataGrid.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/DataGridBoundColumn.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/DataGridCell.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/DataGridCellCollection.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/DataGridCellCoordinates.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/DataGridCheckBoxColumn.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/DataGridClipboard.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/DataGridColumn.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/DataGridColumnCollection.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/DataGridColumnHeader.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/DataGridColumns.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/DataGridDataConnection.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/DataGridDisplayData.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/DataGridEnumerations.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/DataGridError.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/DataGridFillerColumn.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/DataGridLength.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/DataGridRow.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/DataGridRowGroupHeader.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/DataGridRowGroupInfo.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/DataGridRowHeader.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/DataGridRows.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/DataGridSelectedItemsCollection.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/DataGridTemplateColumn.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/DataGridTextColumn.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/DataGridValueConverter.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/EventArgs.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/Extensions.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/IndexToValueTable.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls/DataGrid}/Range.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls}/Primitives/DataGridCellsPresenter.cs (99%) rename src/{Avalonia.DataGrid => Avalonia.Controls}/Primitives/DataGridColumnHeadersPresenter.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls}/Primitives/DataGridDetailsPresenter.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls}/Primitives/DataGridFrozenGrid.cs (100%) rename src/{Avalonia.DataGrid => Avalonia.Controls}/Primitives/DataGridRowsPresenter.cs (100%) rename src/{Avalonia.DataGrid/Utilities => Avalonia.Controls/Utils}/CellEditBinding.cs (95%) rename src/{Avalonia.DataGrid/Utilities => Avalonia.Controls/Utils}/DoubleUtil.cs (99%) rename src/{Avalonia.DataGrid/Utilities => Avalonia.Controls/Utils}/KeyboardHelper.cs (96%) rename src/{Avalonia.DataGrid/Utilities => Avalonia.Controls/Utils}/ReflectionHelper.cs (99%) rename src/{Avalonia.DataGrid/Utilities => Avalonia.Controls/Utils}/TreeHelper.cs (98%) rename src/{Avalonia.DataGrid/Utilities => Avalonia.Controls/Utils}/ValidationUtil.cs (99%) delete mode 100644 src/Avalonia.DataGrid/Avalonia.DataGrid.csproj delete mode 100644 src/Avalonia.DataGrid/Properties/AssemblyInfo.cs diff --git a/src/Avalonia.DataGrid/Collections/AvaloniaGroupDescription.cs b/src/Avalonia.Controls/DataGrid/Collections/AvaloniaGroupDescription.cs similarity index 99% rename from src/Avalonia.DataGrid/Collections/AvaloniaGroupDescription.cs rename to src/Avalonia.Controls/DataGrid/Collections/AvaloniaGroupDescription.cs index fac0869667..1ad22a640a 100644 --- a/src/Avalonia.DataGrid/Collections/AvaloniaGroupDescription.cs +++ b/src/Avalonia.Controls/DataGrid/Collections/AvaloniaGroupDescription.cs @@ -12,6 +12,7 @@ using System.Diagnostics; using System.Globalization; using System.Text; using Avalonia.Controls; +using Avalonia.Controls.Utils; using Avalonia.Data; using Avalonia.Data.Converters; using Avalonia.Utilities; diff --git a/src/Avalonia.DataGrid/Collections/AvaloniaSortDescription.cs b/src/Avalonia.Controls/DataGrid/Collections/AvaloniaSortDescription.cs similarity index 100% rename from src/Avalonia.DataGrid/Collections/AvaloniaSortDescription.cs rename to src/Avalonia.Controls/DataGrid/Collections/AvaloniaSortDescription.cs diff --git a/src/Avalonia.DataGrid/Collections/CollectionView.cs b/src/Avalonia.Controls/DataGrid/Collections/CollectionView.cs similarity index 100% rename from src/Avalonia.DataGrid/Collections/CollectionView.cs rename to src/Avalonia.Controls/DataGrid/Collections/CollectionView.cs diff --git a/src/Avalonia.DataGrid/Collections/ICollectionView.cs b/src/Avalonia.Controls/DataGrid/Collections/ICollectionView.cs similarity index 100% rename from src/Avalonia.DataGrid/Collections/ICollectionView.cs rename to src/Avalonia.Controls/DataGrid/Collections/ICollectionView.cs diff --git a/src/Avalonia.DataGrid/DataGrid.cs b/src/Avalonia.Controls/DataGrid/DataGrid.cs similarity index 100% rename from src/Avalonia.DataGrid/DataGrid.cs rename to src/Avalonia.Controls/DataGrid/DataGrid.cs diff --git a/src/Avalonia.DataGrid/DataGridBoundColumn.cs b/src/Avalonia.Controls/DataGrid/DataGridBoundColumn.cs similarity index 100% rename from src/Avalonia.DataGrid/DataGridBoundColumn.cs rename to src/Avalonia.Controls/DataGrid/DataGridBoundColumn.cs diff --git a/src/Avalonia.DataGrid/DataGridCell.cs b/src/Avalonia.Controls/DataGrid/DataGridCell.cs similarity index 100% rename from src/Avalonia.DataGrid/DataGridCell.cs rename to src/Avalonia.Controls/DataGrid/DataGridCell.cs diff --git a/src/Avalonia.DataGrid/DataGridCellCollection.cs b/src/Avalonia.Controls/DataGrid/DataGridCellCollection.cs similarity index 100% rename from src/Avalonia.DataGrid/DataGridCellCollection.cs rename to src/Avalonia.Controls/DataGrid/DataGridCellCollection.cs diff --git a/src/Avalonia.DataGrid/DataGridCellCoordinates.cs b/src/Avalonia.Controls/DataGrid/DataGridCellCoordinates.cs similarity index 100% rename from src/Avalonia.DataGrid/DataGridCellCoordinates.cs rename to src/Avalonia.Controls/DataGrid/DataGridCellCoordinates.cs diff --git a/src/Avalonia.DataGrid/DataGridCheckBoxColumn.cs b/src/Avalonia.Controls/DataGrid/DataGridCheckBoxColumn.cs similarity index 100% rename from src/Avalonia.DataGrid/DataGridCheckBoxColumn.cs rename to src/Avalonia.Controls/DataGrid/DataGridCheckBoxColumn.cs diff --git a/src/Avalonia.DataGrid/DataGridClipboard.cs b/src/Avalonia.Controls/DataGrid/DataGridClipboard.cs similarity index 100% rename from src/Avalonia.DataGrid/DataGridClipboard.cs rename to src/Avalonia.Controls/DataGrid/DataGridClipboard.cs diff --git a/src/Avalonia.DataGrid/DataGridColumn.cs b/src/Avalonia.Controls/DataGrid/DataGridColumn.cs similarity index 100% rename from src/Avalonia.DataGrid/DataGridColumn.cs rename to src/Avalonia.Controls/DataGrid/DataGridColumn.cs diff --git a/src/Avalonia.DataGrid/DataGridColumnCollection.cs b/src/Avalonia.Controls/DataGrid/DataGridColumnCollection.cs similarity index 100% rename from src/Avalonia.DataGrid/DataGridColumnCollection.cs rename to src/Avalonia.Controls/DataGrid/DataGridColumnCollection.cs diff --git a/src/Avalonia.DataGrid/DataGridColumnHeader.cs b/src/Avalonia.Controls/DataGrid/DataGridColumnHeader.cs similarity index 100% rename from src/Avalonia.DataGrid/DataGridColumnHeader.cs rename to src/Avalonia.Controls/DataGrid/DataGridColumnHeader.cs diff --git a/src/Avalonia.DataGrid/DataGridColumns.cs b/src/Avalonia.Controls/DataGrid/DataGridColumns.cs similarity index 100% rename from src/Avalonia.DataGrid/DataGridColumns.cs rename to src/Avalonia.Controls/DataGrid/DataGridColumns.cs diff --git a/src/Avalonia.DataGrid/DataGridDataConnection.cs b/src/Avalonia.Controls/DataGrid/DataGridDataConnection.cs similarity index 100% rename from src/Avalonia.DataGrid/DataGridDataConnection.cs rename to src/Avalonia.Controls/DataGrid/DataGridDataConnection.cs diff --git a/src/Avalonia.DataGrid/DataGridDisplayData.cs b/src/Avalonia.Controls/DataGrid/DataGridDisplayData.cs similarity index 100% rename from src/Avalonia.DataGrid/DataGridDisplayData.cs rename to src/Avalonia.Controls/DataGrid/DataGridDisplayData.cs diff --git a/src/Avalonia.DataGrid/DataGridEnumerations.cs b/src/Avalonia.Controls/DataGrid/DataGridEnumerations.cs similarity index 100% rename from src/Avalonia.DataGrid/DataGridEnumerations.cs rename to src/Avalonia.Controls/DataGrid/DataGridEnumerations.cs diff --git a/src/Avalonia.DataGrid/DataGridError.cs b/src/Avalonia.Controls/DataGrid/DataGridError.cs similarity index 100% rename from src/Avalonia.DataGrid/DataGridError.cs rename to src/Avalonia.Controls/DataGrid/DataGridError.cs diff --git a/src/Avalonia.DataGrid/DataGridFillerColumn.cs b/src/Avalonia.Controls/DataGrid/DataGridFillerColumn.cs similarity index 100% rename from src/Avalonia.DataGrid/DataGridFillerColumn.cs rename to src/Avalonia.Controls/DataGrid/DataGridFillerColumn.cs diff --git a/src/Avalonia.DataGrid/DataGridLength.cs b/src/Avalonia.Controls/DataGrid/DataGridLength.cs similarity index 100% rename from src/Avalonia.DataGrid/DataGridLength.cs rename to src/Avalonia.Controls/DataGrid/DataGridLength.cs diff --git a/src/Avalonia.DataGrid/DataGridRow.cs b/src/Avalonia.Controls/DataGrid/DataGridRow.cs similarity index 100% rename from src/Avalonia.DataGrid/DataGridRow.cs rename to src/Avalonia.Controls/DataGrid/DataGridRow.cs diff --git a/src/Avalonia.DataGrid/DataGridRowGroupHeader.cs b/src/Avalonia.Controls/DataGrid/DataGridRowGroupHeader.cs similarity index 100% rename from src/Avalonia.DataGrid/DataGridRowGroupHeader.cs rename to src/Avalonia.Controls/DataGrid/DataGridRowGroupHeader.cs diff --git a/src/Avalonia.DataGrid/DataGridRowGroupInfo.cs b/src/Avalonia.Controls/DataGrid/DataGridRowGroupInfo.cs similarity index 100% rename from src/Avalonia.DataGrid/DataGridRowGroupInfo.cs rename to src/Avalonia.Controls/DataGrid/DataGridRowGroupInfo.cs diff --git a/src/Avalonia.DataGrid/DataGridRowHeader.cs b/src/Avalonia.Controls/DataGrid/DataGridRowHeader.cs similarity index 100% rename from src/Avalonia.DataGrid/DataGridRowHeader.cs rename to src/Avalonia.Controls/DataGrid/DataGridRowHeader.cs diff --git a/src/Avalonia.DataGrid/DataGridRows.cs b/src/Avalonia.Controls/DataGrid/DataGridRows.cs similarity index 100% rename from src/Avalonia.DataGrid/DataGridRows.cs rename to src/Avalonia.Controls/DataGrid/DataGridRows.cs diff --git a/src/Avalonia.DataGrid/DataGridSelectedItemsCollection.cs b/src/Avalonia.Controls/DataGrid/DataGridSelectedItemsCollection.cs similarity index 100% rename from src/Avalonia.DataGrid/DataGridSelectedItemsCollection.cs rename to src/Avalonia.Controls/DataGrid/DataGridSelectedItemsCollection.cs diff --git a/src/Avalonia.DataGrid/DataGridTemplateColumn.cs b/src/Avalonia.Controls/DataGrid/DataGridTemplateColumn.cs similarity index 100% rename from src/Avalonia.DataGrid/DataGridTemplateColumn.cs rename to src/Avalonia.Controls/DataGrid/DataGridTemplateColumn.cs diff --git a/src/Avalonia.DataGrid/DataGridTextColumn.cs b/src/Avalonia.Controls/DataGrid/DataGridTextColumn.cs similarity index 100% rename from src/Avalonia.DataGrid/DataGridTextColumn.cs rename to src/Avalonia.Controls/DataGrid/DataGridTextColumn.cs diff --git a/src/Avalonia.DataGrid/DataGridValueConverter.cs b/src/Avalonia.Controls/DataGrid/DataGridValueConverter.cs similarity index 100% rename from src/Avalonia.DataGrid/DataGridValueConverter.cs rename to src/Avalonia.Controls/DataGrid/DataGridValueConverter.cs diff --git a/src/Avalonia.DataGrid/EventArgs.cs b/src/Avalonia.Controls/DataGrid/EventArgs.cs similarity index 100% rename from src/Avalonia.DataGrid/EventArgs.cs rename to src/Avalonia.Controls/DataGrid/EventArgs.cs diff --git a/src/Avalonia.DataGrid/Extensions.cs b/src/Avalonia.Controls/DataGrid/Extensions.cs similarity index 100% rename from src/Avalonia.DataGrid/Extensions.cs rename to src/Avalonia.Controls/DataGrid/Extensions.cs diff --git a/src/Avalonia.DataGrid/IndexToValueTable.cs b/src/Avalonia.Controls/DataGrid/IndexToValueTable.cs similarity index 100% rename from src/Avalonia.DataGrid/IndexToValueTable.cs rename to src/Avalonia.Controls/DataGrid/IndexToValueTable.cs diff --git a/src/Avalonia.DataGrid/Range.cs b/src/Avalonia.Controls/DataGrid/Range.cs similarity index 100% rename from src/Avalonia.DataGrid/Range.cs rename to src/Avalonia.Controls/DataGrid/Range.cs diff --git a/src/Avalonia.DataGrid/Primitives/DataGridCellsPresenter.cs b/src/Avalonia.Controls/Primitives/DataGridCellsPresenter.cs similarity index 99% rename from src/Avalonia.DataGrid/Primitives/DataGridCellsPresenter.cs rename to src/Avalonia.Controls/Primitives/DataGridCellsPresenter.cs index a6f34e7292..98af030b1b 100644 --- a/src/Avalonia.DataGrid/Primitives/DataGridCellsPresenter.cs +++ b/src/Avalonia.Controls/Primitives/DataGridCellsPresenter.cs @@ -7,6 +7,7 @@ using Avalonia.Media; using Avalonia.Utilities; using System; using System.Diagnostics; +using Avalonia.Controls; namespace Avalonia.Controls.Primitives { diff --git a/src/Avalonia.DataGrid/Primitives/DataGridColumnHeadersPresenter.cs b/src/Avalonia.Controls/Primitives/DataGridColumnHeadersPresenter.cs similarity index 100% rename from src/Avalonia.DataGrid/Primitives/DataGridColumnHeadersPresenter.cs rename to src/Avalonia.Controls/Primitives/DataGridColumnHeadersPresenter.cs diff --git a/src/Avalonia.DataGrid/Primitives/DataGridDetailsPresenter.cs b/src/Avalonia.Controls/Primitives/DataGridDetailsPresenter.cs similarity index 100% rename from src/Avalonia.DataGrid/Primitives/DataGridDetailsPresenter.cs rename to src/Avalonia.Controls/Primitives/DataGridDetailsPresenter.cs diff --git a/src/Avalonia.DataGrid/Primitives/DataGridFrozenGrid.cs b/src/Avalonia.Controls/Primitives/DataGridFrozenGrid.cs similarity index 100% rename from src/Avalonia.DataGrid/Primitives/DataGridFrozenGrid.cs rename to src/Avalonia.Controls/Primitives/DataGridFrozenGrid.cs diff --git a/src/Avalonia.DataGrid/Primitives/DataGridRowsPresenter.cs b/src/Avalonia.Controls/Primitives/DataGridRowsPresenter.cs similarity index 100% rename from src/Avalonia.DataGrid/Primitives/DataGridRowsPresenter.cs rename to src/Avalonia.Controls/Primitives/DataGridRowsPresenter.cs diff --git a/src/Avalonia.DataGrid/Utilities/CellEditBinding.cs b/src/Avalonia.Controls/Utils/CellEditBinding.cs similarity index 95% rename from src/Avalonia.DataGrid/Utilities/CellEditBinding.cs rename to src/Avalonia.Controls/Utils/CellEditBinding.cs index 630d21c7cb..3a61878f54 100644 --- a/src/Avalonia.DataGrid/Utilities/CellEditBinding.cs +++ b/src/Avalonia.Controls/Utils/CellEditBinding.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Reactive.Subjects; using System.Text; -namespace Avalonia.Utilities +namespace Avalonia.Controls.Utils { public interface ICellEditBinding { @@ -38,7 +38,7 @@ namespace Avalonia.Utilities action(_validationErrors); var isValid = IsValid; - if(!isValid || !wasValid) + if (!isValid || !wasValid) { _changedSubject.OnNext(isValid); } @@ -80,13 +80,13 @@ namespace Avalonia.Utilities private void OnValidationError(BindingNotification notification) { - if(notification.Error != null) + if (notification.Error != null) { _editBinding.AlterValidationErrors(errors => { errors.Clear(); var unpackedErrors = ValidationUtil.UnpackException(notification.Error); - if(unpackedErrors != null) + if (unpackedErrors != null) errors.AddRange(unpackedErrors); }); } @@ -96,7 +96,7 @@ namespace Avalonia.Utilities _controlValue = value; _isControlValueSet = true; - if(!_editBinding.IsValid) + if (!_editBinding.IsValid) { SetSourceValue(value); } @@ -152,7 +152,7 @@ namespace Avalonia.Utilities } public void CommitEdit() { - if(_isControlValueSet) + if (_isControlValueSet) SetSourceValue(_controlValue); } } diff --git a/src/Avalonia.DataGrid/Utilities/DoubleUtil.cs b/src/Avalonia.Controls/Utils/DoubleUtil.cs similarity index 99% rename from src/Avalonia.DataGrid/Utilities/DoubleUtil.cs rename to src/Avalonia.Controls/Utils/DoubleUtil.cs index 60c7bd555a..ec0e8836d7 100644 --- a/src/Avalonia.DataGrid/Utilities/DoubleUtil.cs +++ b/src/Avalonia.Controls/Utils/DoubleUtil.cs @@ -5,7 +5,7 @@ using System; -namespace Avalonia.Utilities +namespace Avalonia.Controls.Utils { internal static class DoubleUtil { diff --git a/src/Avalonia.DataGrid/Utilities/KeyboardHelper.cs b/src/Avalonia.Controls/Utils/KeyboardHelper.cs similarity index 96% rename from src/Avalonia.DataGrid/Utilities/KeyboardHelper.cs rename to src/Avalonia.Controls/Utils/KeyboardHelper.cs index d9010f423e..473ddce3ad 100644 --- a/src/Avalonia.DataGrid/Utilities/KeyboardHelper.cs +++ b/src/Avalonia.Controls/Utils/KeyboardHelper.cs @@ -5,7 +5,7 @@ using Avalonia.Input; -namespace Avalonia.Controls.Primitives +namespace Avalonia.Controls.Utils { internal static class KeyboardHelper { diff --git a/src/Avalonia.DataGrid/Utilities/ReflectionHelper.cs b/src/Avalonia.Controls/Utils/ReflectionHelper.cs similarity index 99% rename from src/Avalonia.DataGrid/Utilities/ReflectionHelper.cs rename to src/Avalonia.Controls/Utils/ReflectionHelper.cs index 8fdcaa22c1..5bb6ad8722 100644 --- a/src/Avalonia.DataGrid/Utilities/ReflectionHelper.cs +++ b/src/Avalonia.Controls/Utils/ReflectionHelper.cs @@ -12,7 +12,7 @@ using System.Diagnostics; using System.Globalization; using System.Reflection; -namespace Avalonia.Utilities +namespace Avalonia.Controls.Utils { internal static class TypeHelper { diff --git a/src/Avalonia.DataGrid/Utilities/TreeHelper.cs b/src/Avalonia.Controls/Utils/TreeHelper.cs similarity index 98% rename from src/Avalonia.DataGrid/Utilities/TreeHelper.cs rename to src/Avalonia.Controls/Utils/TreeHelper.cs index 5ec296191a..2450708255 100644 --- a/src/Avalonia.DataGrid/Utilities/TreeHelper.cs +++ b/src/Avalonia.Controls/Utils/TreeHelper.cs @@ -7,7 +7,7 @@ using Avalonia.Input; using Avalonia.VisualTree; using Avalonia.Controls; -namespace Avalonia.Utilities +namespace Avalonia.Controls.Utils { internal static class TreeHelper { diff --git a/src/Avalonia.DataGrid/Utilities/ValidationUtil.cs b/src/Avalonia.Controls/Utils/ValidationUtil.cs similarity index 99% rename from src/Avalonia.DataGrid/Utilities/ValidationUtil.cs rename to src/Avalonia.Controls/Utils/ValidationUtil.cs index a7ccc0a901..c619e3cddc 100644 --- a/src/Avalonia.DataGrid/Utilities/ValidationUtil.cs +++ b/src/Avalonia.Controls/Utils/ValidationUtil.cs @@ -11,7 +11,7 @@ using System.Threading; using System.Linq; using Avalonia.Data; -namespace Avalonia.Utilities +namespace Avalonia.Controls.Utils { internal static class ValidationUtil { diff --git a/src/Avalonia.DataGrid/Avalonia.DataGrid.csproj b/src/Avalonia.DataGrid/Avalonia.DataGrid.csproj deleted file mode 100644 index b0189a4994..0000000000 --- a/src/Avalonia.DataGrid/Avalonia.DataGrid.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - netstandard2.0 - - - - - - - diff --git a/src/Avalonia.DataGrid/Properties/AssemblyInfo.cs b/src/Avalonia.DataGrid/Properties/AssemblyInfo.cs deleted file mode 100644 index db6301515c..0000000000 --- a/src/Avalonia.DataGrid/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using Avalonia.Metadata; - -[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls")] -[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Primitives")] -//Avalonia.Controls.Primitives -//Avalonia.Controls.Primitives \ No newline at end of file