Object writer changes to implement shorthand syntax for ColumnDefinitions and RowDefinitions #4
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
| // See the LICENSE file in the project root for more information. | ||
|
|
||
| using System.ComponentModel; | ||
| using System.Windows.Controls; | ||
| using System.Windows.Markup; | ||
| using System.Globalization; | ||
| using System.Text; | ||
| using MS.Internal; | ||
|
|
||
| namespace System.Windows.Controls | ||
| { | ||
| internal sealed class ColumnDefinitionConverter : TypeConverter | ||
| { | ||
| #region Public Methods | ||
|
|
||
| /// <summary> | ||
| /// CanConvertFrom - Returns whether or not this class can convert from a given type. | ||
| /// </summary> | ||
| /// <returns> | ||
| /// bool - True if this converter can convert from the provided type, false if not. | ||
| /// </returns> | ||
| /// <param name="typeDescriptorContext"> The ITypeDescriptorContext for this call. </param> | ||
| /// <param name="sourceType"> The Type being queried for support. </param> | ||
| public override bool CanConvertFrom(ITypeDescriptorContext typeDescriptorContext, Type sourceType) | ||
| { | ||
| return sourceType == typeof(string); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// CanConvertTo - Returns whether or not this class can convert to a given type. | ||
| /// </summary> | ||
| /// <returns> | ||
| /// bool - True if this converter can convert to the provided type, false if not. | ||
| /// </returns> | ||
| /// <param name="typeDescriptorContext"> The ITypeDescriptorContext for this call. </param> | ||
| /// <param name="destinationType"> The Type being queried for support. </param> | ||
| public override bool CanConvertTo(ITypeDescriptorContext typeDescriptorContext, Type destinationType) | ||
| { | ||
| return destinationType == typeof(string); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// ConvertFrom - Attempt to convert to a ColumnDefinitionCollection from the given object. | ||
| /// </summary> | ||
| /// <returns> | ||
| /// The object which was constructed. | ||
| /// </returns> | ||
| /// <exception cref="ArgumentNullException"> | ||
| /// An ArgumentNullException is thrown if the example object is null. | ||
| /// </exception> | ||
| /// <param name="typeDescriptorContext"> The ITypeDescriptorContext for this call. </param> | ||
| /// <param name="cultureInfo"> The CultureInfo which is respected when converting. </param> | ||
| /// <param name="value"> The Thickness to convert. </param> | ||
| public override object ConvertFrom(ITypeDescriptorContext typeDescriptorContext, CultureInfo cultureInfo, object value) | ||
| { | ||
| if (value is string input) | ||
| { | ||
| ColumnDefinition columnDefinition = new ColumnDefinition{ Width = GridLengthConverter.FromString(input, cultureInfo) }; | ||
| return columnDefinition; | ||
| } | ||
| throw GetConvertFromException(value); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// ConvertTo - Attempt to convert a ColumnDefinitionCollection to the given type | ||
| /// </summary> | ||
| /// <returns> | ||
| /// The object which was constructed. | ||
| /// </returns> | ||
| /// <exception cref="ArgumentNullException"> | ||
| /// An ArgumentNullException is thrown if the example object is null. | ||
| /// </exception> | ||
| /// <param name="typeDescriptorContext"> The ITypeDescriptorContext for this call. </param> | ||
| /// <param name="cultureInfo"> The CultureInfo which is respected when converting. </param> | ||
| /// <param name="value"> The ColumnDefinitionCollection to convert. </param> | ||
| /// <param name="destinationType">The type to which to convert the ColumnDefinitionCollection instance. </param> | ||
| public override object ConvertTo(ITypeDescriptorContext typeDescriptorContext, CultureInfo cultureInfo, object value, Type destinationType) | ||
| { | ||
| ArgumentNullException.ThrowIfNull(value); | ||
| ArgumentNullException.ThrowIfNull(destinationType); | ||
| if (destinationType == typeof(string) && value is ColumnDefinition columnDefinition) | ||
| { | ||
| return GridLengthConverter.ToString(columnDefinition.Width, cultureInfo); | ||
| } | ||
| throw GetConvertToException(value, destinationType); | ||
| } | ||
|
|
||
| #endregion Public Methods | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
| // See the LICENSE file in the project root for more information. | ||
|
|
||
| using System.ComponentModel; | ||
| using System.Windows.Controls; | ||
| using System.Windows.Markup; | ||
| using System.Globalization; | ||
| using System.Text; | ||
| using MS.Internal; | ||
|
|
||
| namespace System.Windows.Controls | ||
| { | ||
| internal sealed class RowDefinitionConverter : TypeConverter | ||
| { | ||
| #region Public Methods | ||
|
|
||
| /// <summary> | ||
| /// CanConvertFrom - Returns whether or not this class can convert from a given type. | ||
| /// </summary> | ||
| /// <returns> | ||
| /// bool - True if this converter can convert from the provided type, false if not. | ||
| /// </returns> | ||
| /// <param name="typeDescriptorContext"> The ITypeDescriptorContext for this call. </param> | ||
| /// <param name="sourceType"> The Type being queried for support. </param> | ||
| public override bool CanConvertFrom(ITypeDescriptorContext typeDescriptorContext, Type sourceType) | ||
| { | ||
| return sourceType == typeof(string); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// CanConvertTo - Returns whether or not this class can convert to a given type. | ||
| /// </summary> | ||
| /// <returns> | ||
| /// bool - True if this converter can convert to the provided type, false if not. | ||
| /// </returns> | ||
| /// <param name="typeDescriptorContext"> The ITypeDescriptorContext for this call. </param> | ||
| /// <param name="destinationType"> The Type being queried for support. </param> | ||
| public override bool CanConvertTo(ITypeDescriptorContext typeDescriptorContext, Type destinationType) | ||
| { | ||
| return destinationType == typeof(string); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// ConvertFrom - Attempt to convert to a RowDefinitionCollection from the given object. | ||
| /// </summary> | ||
| /// <returns> | ||
| /// The object which was constructed. | ||
| /// </returns> | ||
| /// <exception cref="ArgumentNullException"> | ||
| /// An ArgumentNullException is thrown if the example object is null. | ||
| /// </exception> | ||
| /// <param name="typeDescriptorContext"> The ITypeDescriptorContext for this call. </param> | ||
| /// <param name="cultureInfo"> The CultureInfo which is respected when converting. </param> | ||
| /// <param name="value"> The Thickness to convert. </param> | ||
| public override object ConvertFrom(ITypeDescriptorContext typeDescriptorContext, CultureInfo cultureInfo, object value) | ||
| { | ||
| if (value is string input) | ||
| { | ||
| RowDefinition rowDefinition = new RowDefinition{ Height = GridLengthConverter.FromString(input, cultureInfo) }; | ||
|
There was a problem hiding this comment. You might be able to use type descriptor to decide whether you should return column or row and have only one converter (possibly even the grid length one), but if this ends up being public, it possibly is a better API separately |
||
| return rowDefinition; | ||
| } | ||
| throw GetConvertFromException(value); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// ConvertTo - Attempt to convert a RowDefinitionCollection to the given type | ||
| /// </summary> | ||
| /// <returns> | ||
| /// The object which was constructed. | ||
| /// </returns> | ||
| /// <exception cref="ArgumentNullException"> | ||
| /// An ArgumentNullException is thrown if the example object is null. | ||
| /// </exception> | ||
| /// <param name="typeDescriptorContext"> The ITypeDescriptorContext for this call. </param> | ||
| /// <param name="cultureInfo"> The CultureInfo which is respected when converting. </param> | ||
| /// <param name="value"> The RowDefinitionCollection to convert. </param> | ||
| /// <param name="destinationType">The type to which to convert the RowDefinitionCollection instance. </param> | ||
| public override object ConvertTo(ITypeDescriptorContext typeDescriptorContext, CultureInfo cultureInfo, object value, Type destinationType) | ||
| { | ||
| ArgumentNullException.ThrowIfNull(value); | ||
| ArgumentNullException.ThrowIfNull(destinationType); | ||
| if (destinationType == typeof(string) && value is RowDefinition rowDefinition) | ||
| { | ||
| return GridLengthConverter.ToString(rowDefinition.Height, cultureInfo); | ||
| } | ||
| throw GetConvertToException(value, destinationType); | ||
| } | ||
|
|
||
| #endregion Public Methods | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You need to do more checks, you cannot express columns/rows that have min/max/offset set