Browse Source

Make GetSetValues return PerspexPropertyValues.

pull/39/head
Steven Kirk 11 years ago
parent
commit
8218d18bc2
  1. 7
      Perspex.Base/PerspexObject.cs
  2. 6
      Perspex.Diagnostics/Debug.cs

7
Perspex.Base/PerspexObject.cs

@ -446,14 +446,11 @@ namespace Perspex
/// <summary> /// <summary>
/// Gets all of the <see cref="PerspexProperty"/> values explicitly set on this object. /// Gets all of the <see cref="PerspexProperty"/> values explicitly set on this object.
/// </summary> /// </summary>
public IEnumerable<Tuple<PerspexProperty, object, BindingPriority>> GetSetValues() public IEnumerable<PerspexPropertyValue> GetSetValues()
{ {
foreach (var value in this.values) foreach (var value in this.values)
{ {
yield return Tuple.Create( yield return new PerspexPropertyValue(value.Key, value.Value);
value.Key,
value.Value.Value,
(BindingPriority)value.Value.ValuePriority);
} }
} }

6
Perspex.Diagnostics/Debug.cs

@ -44,11 +44,11 @@ namespace Perspex.Diagnostics
{ {
builder.Append(Indent(indent)); builder.Append(Indent(indent));
builder.Append(" | "); builder.Append(" | ");
builder.Append(value.Item1.Name); builder.Append(value.Property.Name);
builder.Append(" = "); builder.Append(" = ");
builder.Append(value.Item2 ?? "(null)"); builder.Append(value.CurrentValue ?? "(null)");
builder.Append(" ["); builder.Append(" [");
builder.Append(value.Item3); builder.Append(value.PriorityValue.ValuePriority);
builder.AppendLine("]"); builder.AppendLine("]");
} }
} }

Loading…
Cancel
Save