Browse Source

DataGrid integration to Avalonia.Controls part 1 of N

pull/2109/head
Jumar Macato 8 years ago
parent
commit
01f2a070cf
No known key found for this signature in database GPG Key ID: B19884DAC3A5BF3F
  1. 1
      src/Avalonia.Controls/DataGrid/Collections/AvaloniaGroupDescription.cs
  2. 0
      src/Avalonia.Controls/DataGrid/Collections/AvaloniaSortDescription.cs
  3. 0
      src/Avalonia.Controls/DataGrid/Collections/CollectionView.cs
  4. 0
      src/Avalonia.Controls/DataGrid/Collections/ICollectionView.cs
  5. 0
      src/Avalonia.Controls/DataGrid/DataGrid.cs
  6. 0
      src/Avalonia.Controls/DataGrid/DataGridBoundColumn.cs
  7. 0
      src/Avalonia.Controls/DataGrid/DataGridCell.cs
  8. 0
      src/Avalonia.Controls/DataGrid/DataGridCellCollection.cs
  9. 0
      src/Avalonia.Controls/DataGrid/DataGridCellCoordinates.cs
  10. 0
      src/Avalonia.Controls/DataGrid/DataGridCheckBoxColumn.cs
  11. 0
      src/Avalonia.Controls/DataGrid/DataGridClipboard.cs
  12. 0
      src/Avalonia.Controls/DataGrid/DataGridColumn.cs
  13. 0
      src/Avalonia.Controls/DataGrid/DataGridColumnCollection.cs
  14. 0
      src/Avalonia.Controls/DataGrid/DataGridColumnHeader.cs
  15. 0
      src/Avalonia.Controls/DataGrid/DataGridColumns.cs
  16. 0
      src/Avalonia.Controls/DataGrid/DataGridDataConnection.cs
  17. 0
      src/Avalonia.Controls/DataGrid/DataGridDisplayData.cs
  18. 0
      src/Avalonia.Controls/DataGrid/DataGridEnumerations.cs
  19. 0
      src/Avalonia.Controls/DataGrid/DataGridError.cs
  20. 0
      src/Avalonia.Controls/DataGrid/DataGridFillerColumn.cs
  21. 0
      src/Avalonia.Controls/DataGrid/DataGridLength.cs
  22. 0
      src/Avalonia.Controls/DataGrid/DataGridRow.cs
  23. 0
      src/Avalonia.Controls/DataGrid/DataGridRowGroupHeader.cs
  24. 0
      src/Avalonia.Controls/DataGrid/DataGridRowGroupInfo.cs
  25. 0
      src/Avalonia.Controls/DataGrid/DataGridRowHeader.cs
  26. 0
      src/Avalonia.Controls/DataGrid/DataGridRows.cs
  27. 0
      src/Avalonia.Controls/DataGrid/DataGridSelectedItemsCollection.cs
  28. 0
      src/Avalonia.Controls/DataGrid/DataGridTemplateColumn.cs
  29. 0
      src/Avalonia.Controls/DataGrid/DataGridTextColumn.cs
  30. 0
      src/Avalonia.Controls/DataGrid/DataGridValueConverter.cs
  31. 0
      src/Avalonia.Controls/DataGrid/EventArgs.cs
  32. 0
      src/Avalonia.Controls/DataGrid/Extensions.cs
  33. 0
      src/Avalonia.Controls/DataGrid/IndexToValueTable.cs
  34. 0
      src/Avalonia.Controls/DataGrid/Range.cs
  35. 1
      src/Avalonia.Controls/Primitives/DataGridCellsPresenter.cs
  36. 0
      src/Avalonia.Controls/Primitives/DataGridColumnHeadersPresenter.cs
  37. 0
      src/Avalonia.Controls/Primitives/DataGridDetailsPresenter.cs
  38. 0
      src/Avalonia.Controls/Primitives/DataGridFrozenGrid.cs
  39. 0
      src/Avalonia.Controls/Primitives/DataGridRowsPresenter.cs
  40. 12
      src/Avalonia.Controls/Utils/CellEditBinding.cs
  41. 2
      src/Avalonia.Controls/Utils/DoubleUtil.cs
  42. 2
      src/Avalonia.Controls/Utils/KeyboardHelper.cs
  43. 2
      src/Avalonia.Controls/Utils/ReflectionHelper.cs
  44. 2
      src/Avalonia.Controls/Utils/TreeHelper.cs
  45. 2
      src/Avalonia.Controls/Utils/ValidationUtil.cs
  46. 11
      src/Avalonia.DataGrid/Avalonia.DataGrid.csproj
  47. 8
      src/Avalonia.DataGrid/Properties/AssemblyInfo.cs

1
src/Avalonia.DataGrid/Collections/AvaloniaGroupDescription.cs → src/Avalonia.Controls/DataGrid/Collections/AvaloniaGroupDescription.cs

@ -12,6 +12,7 @@ using System.Diagnostics;
using System.Globalization; using System.Globalization;
using System.Text; using System.Text;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Controls.Utils;
using Avalonia.Data; using Avalonia.Data;
using Avalonia.Data.Converters; using Avalonia.Data.Converters;
using Avalonia.Utilities; using Avalonia.Utilities;

0
src/Avalonia.DataGrid/Collections/AvaloniaSortDescription.cs → src/Avalonia.Controls/DataGrid/Collections/AvaloniaSortDescription.cs

0
src/Avalonia.DataGrid/Collections/CollectionView.cs → src/Avalonia.Controls/DataGrid/Collections/CollectionView.cs

0
src/Avalonia.DataGrid/Collections/ICollectionView.cs → src/Avalonia.Controls/DataGrid/Collections/ICollectionView.cs

0
src/Avalonia.DataGrid/DataGrid.cs → src/Avalonia.Controls/DataGrid/DataGrid.cs

0
src/Avalonia.DataGrid/DataGridBoundColumn.cs → src/Avalonia.Controls/DataGrid/DataGridBoundColumn.cs

0
src/Avalonia.DataGrid/DataGridCell.cs → src/Avalonia.Controls/DataGrid/DataGridCell.cs

0
src/Avalonia.DataGrid/DataGridCellCollection.cs → src/Avalonia.Controls/DataGrid/DataGridCellCollection.cs

0
src/Avalonia.DataGrid/DataGridCellCoordinates.cs → src/Avalonia.Controls/DataGrid/DataGridCellCoordinates.cs

0
src/Avalonia.DataGrid/DataGridCheckBoxColumn.cs → src/Avalonia.Controls/DataGrid/DataGridCheckBoxColumn.cs

0
src/Avalonia.DataGrid/DataGridClipboard.cs → src/Avalonia.Controls/DataGrid/DataGridClipboard.cs

0
src/Avalonia.DataGrid/DataGridColumn.cs → src/Avalonia.Controls/DataGrid/DataGridColumn.cs

0
src/Avalonia.DataGrid/DataGridColumnCollection.cs → src/Avalonia.Controls/DataGrid/DataGridColumnCollection.cs

0
src/Avalonia.DataGrid/DataGridColumnHeader.cs → src/Avalonia.Controls/DataGrid/DataGridColumnHeader.cs

0
src/Avalonia.DataGrid/DataGridColumns.cs → src/Avalonia.Controls/DataGrid/DataGridColumns.cs

0
src/Avalonia.DataGrid/DataGridDataConnection.cs → src/Avalonia.Controls/DataGrid/DataGridDataConnection.cs

0
src/Avalonia.DataGrid/DataGridDisplayData.cs → src/Avalonia.Controls/DataGrid/DataGridDisplayData.cs

0
src/Avalonia.DataGrid/DataGridEnumerations.cs → src/Avalonia.Controls/DataGrid/DataGridEnumerations.cs

0
src/Avalonia.DataGrid/DataGridError.cs → src/Avalonia.Controls/DataGrid/DataGridError.cs

0
src/Avalonia.DataGrid/DataGridFillerColumn.cs → src/Avalonia.Controls/DataGrid/DataGridFillerColumn.cs

0
src/Avalonia.DataGrid/DataGridLength.cs → src/Avalonia.Controls/DataGrid/DataGridLength.cs

0
src/Avalonia.DataGrid/DataGridRow.cs → src/Avalonia.Controls/DataGrid/DataGridRow.cs

0
src/Avalonia.DataGrid/DataGridRowGroupHeader.cs → src/Avalonia.Controls/DataGrid/DataGridRowGroupHeader.cs

0
src/Avalonia.DataGrid/DataGridRowGroupInfo.cs → src/Avalonia.Controls/DataGrid/DataGridRowGroupInfo.cs

0
src/Avalonia.DataGrid/DataGridRowHeader.cs → src/Avalonia.Controls/DataGrid/DataGridRowHeader.cs

0
src/Avalonia.DataGrid/DataGridRows.cs → src/Avalonia.Controls/DataGrid/DataGridRows.cs

0
src/Avalonia.DataGrid/DataGridSelectedItemsCollection.cs → src/Avalonia.Controls/DataGrid/DataGridSelectedItemsCollection.cs

0
src/Avalonia.DataGrid/DataGridTemplateColumn.cs → src/Avalonia.Controls/DataGrid/DataGridTemplateColumn.cs

0
src/Avalonia.DataGrid/DataGridTextColumn.cs → src/Avalonia.Controls/DataGrid/DataGridTextColumn.cs

0
src/Avalonia.DataGrid/DataGridValueConverter.cs → src/Avalonia.Controls/DataGrid/DataGridValueConverter.cs

0
src/Avalonia.DataGrid/EventArgs.cs → src/Avalonia.Controls/DataGrid/EventArgs.cs

0
src/Avalonia.DataGrid/Extensions.cs → src/Avalonia.Controls/DataGrid/Extensions.cs

0
src/Avalonia.DataGrid/IndexToValueTable.cs → src/Avalonia.Controls/DataGrid/IndexToValueTable.cs

0
src/Avalonia.DataGrid/Range.cs → src/Avalonia.Controls/DataGrid/Range.cs

1
src/Avalonia.DataGrid/Primitives/DataGridCellsPresenter.cs → src/Avalonia.Controls/Primitives/DataGridCellsPresenter.cs

@ -7,6 +7,7 @@ using Avalonia.Media;
using Avalonia.Utilities; using Avalonia.Utilities;
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using Avalonia.Controls;
namespace Avalonia.Controls.Primitives namespace Avalonia.Controls.Primitives
{ {

0
src/Avalonia.DataGrid/Primitives/DataGridColumnHeadersPresenter.cs → src/Avalonia.Controls/Primitives/DataGridColumnHeadersPresenter.cs

0
src/Avalonia.DataGrid/Primitives/DataGridDetailsPresenter.cs → src/Avalonia.Controls/Primitives/DataGridDetailsPresenter.cs

0
src/Avalonia.DataGrid/Primitives/DataGridFrozenGrid.cs → src/Avalonia.Controls/Primitives/DataGridFrozenGrid.cs

0
src/Avalonia.DataGrid/Primitives/DataGridRowsPresenter.cs → src/Avalonia.Controls/Primitives/DataGridRowsPresenter.cs

12
src/Avalonia.DataGrid/Utilities/CellEditBinding.cs → src/Avalonia.Controls/Utils/CellEditBinding.cs

@ -6,7 +6,7 @@ using System.Collections.Generic;
using System.Reactive.Subjects; using System.Reactive.Subjects;
using System.Text; using System.Text;
namespace Avalonia.Utilities namespace Avalonia.Controls.Utils
{ {
public interface ICellEditBinding public interface ICellEditBinding
{ {
@ -38,7 +38,7 @@ namespace Avalonia.Utilities
action(_validationErrors); action(_validationErrors);
var isValid = IsValid; var isValid = IsValid;
if(!isValid || !wasValid) if (!isValid || !wasValid)
{ {
_changedSubject.OnNext(isValid); _changedSubject.OnNext(isValid);
} }
@ -80,13 +80,13 @@ namespace Avalonia.Utilities
private void OnValidationError(BindingNotification notification) private void OnValidationError(BindingNotification notification)
{ {
if(notification.Error != null) if (notification.Error != null)
{ {
_editBinding.AlterValidationErrors(errors => _editBinding.AlterValidationErrors(errors =>
{ {
errors.Clear(); errors.Clear();
var unpackedErrors = ValidationUtil.UnpackException(notification.Error); var unpackedErrors = ValidationUtil.UnpackException(notification.Error);
if(unpackedErrors != null) if (unpackedErrors != null)
errors.AddRange(unpackedErrors); errors.AddRange(unpackedErrors);
}); });
} }
@ -96,7 +96,7 @@ namespace Avalonia.Utilities
_controlValue = value; _controlValue = value;
_isControlValueSet = true; _isControlValueSet = true;
if(!_editBinding.IsValid) if (!_editBinding.IsValid)
{ {
SetSourceValue(value); SetSourceValue(value);
} }
@ -152,7 +152,7 @@ namespace Avalonia.Utilities
} }
public void CommitEdit() public void CommitEdit()
{ {
if(_isControlValueSet) if (_isControlValueSet)
SetSourceValue(_controlValue); SetSourceValue(_controlValue);
} }
} }

2
src/Avalonia.DataGrid/Utilities/DoubleUtil.cs → src/Avalonia.Controls/Utils/DoubleUtil.cs

@ -5,7 +5,7 @@
using System; using System;
namespace Avalonia.Utilities namespace Avalonia.Controls.Utils
{ {
internal static class DoubleUtil internal static class DoubleUtil
{ {

2
src/Avalonia.DataGrid/Utilities/KeyboardHelper.cs → src/Avalonia.Controls/Utils/KeyboardHelper.cs

@ -5,7 +5,7 @@
using Avalonia.Input; using Avalonia.Input;
namespace Avalonia.Controls.Primitives namespace Avalonia.Controls.Utils
{ {
internal static class KeyboardHelper internal static class KeyboardHelper
{ {

2
src/Avalonia.DataGrid/Utilities/ReflectionHelper.cs → src/Avalonia.Controls/Utils/ReflectionHelper.cs

@ -12,7 +12,7 @@ using System.Diagnostics;
using System.Globalization; using System.Globalization;
using System.Reflection; using System.Reflection;
namespace Avalonia.Utilities namespace Avalonia.Controls.Utils
{ {
internal static class TypeHelper internal static class TypeHelper
{ {

2
src/Avalonia.DataGrid/Utilities/TreeHelper.cs → src/Avalonia.Controls/Utils/TreeHelper.cs

@ -7,7 +7,7 @@ using Avalonia.Input;
using Avalonia.VisualTree; using Avalonia.VisualTree;
using Avalonia.Controls; using Avalonia.Controls;
namespace Avalonia.Utilities namespace Avalonia.Controls.Utils
{ {
internal static class TreeHelper internal static class TreeHelper
{ {

2
src/Avalonia.DataGrid/Utilities/ValidationUtil.cs → src/Avalonia.Controls/Utils/ValidationUtil.cs

@ -11,7 +11,7 @@ using System.Threading;
using System.Linq; using System.Linq;
using Avalonia.Data; using Avalonia.Data;
namespace Avalonia.Utilities namespace Avalonia.Controls.Utils
{ {
internal static class ValidationUtil internal static class ValidationUtil
{ {

11
src/Avalonia.DataGrid/Avalonia.DataGrid.csproj

@ -1,11 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="0.6.2-*" />
</ItemGroup>
</Project>

8
src/Avalonia.DataGrid/Properties/AssemblyInfo.cs

@ -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
Loading…
Cancel
Save