Browse Source

Revert "Removed unused owner reference."

This reverts commit d0e2a844db.
pull/3255/head
Steven Kirk 7 years ago
parent
commit
399417692f
  1. 3
      src/Avalonia.Base/PropertyStore/BindingEntry.cs
  2. 2
      src/Avalonia.Base/PropertyStore/PriorityValue.cs
  3. 2
      src/Avalonia.Base/ValueStore.cs

3
src/Avalonia.Base/PropertyStore/BindingEntry.cs

@ -19,15 +19,18 @@ namespace Avalonia.PropertyStore
/// <typeparam name="T">The property type.</typeparam> /// <typeparam name="T">The property type.</typeparam>
internal class BindingEntry<T> : IBindingEntry, IPriorityValueEntry<T>, IObserver<BindingValue<T>> internal class BindingEntry<T> : IBindingEntry, IPriorityValueEntry<T>, IObserver<BindingValue<T>>
{ {
private readonly IAvaloniaObject _owner;
private IValueSink _sink; private IValueSink _sink;
private IDisposable? _subscription; private IDisposable? _subscription;
public BindingEntry( public BindingEntry(
IAvaloniaObject owner,
StyledPropertyBase<T> property, StyledPropertyBase<T> property,
IObservable<BindingValue<T>> source, IObservable<BindingValue<T>> source,
BindingPriority priority, BindingPriority priority,
IValueSink sink) IValueSink sink)
{ {
_owner = owner;
Property = property; Property = property;
Source = source; Source = source;
Priority = priority; Priority = priority;

2
src/Avalonia.Base/PropertyStore/PriorityValue.cs

@ -95,7 +95,7 @@ namespace Avalonia.PropertyStore
public BindingEntry<T> AddBinding(IObservable<BindingValue<T>> source, BindingPriority priority) public BindingEntry<T> AddBinding(IObservable<BindingValue<T>> source, BindingPriority priority)
{ {
var binding = new BindingEntry<T>(Property, source, priority, this); var binding = new BindingEntry<T>(_owner, Property, source, priority, this);
var insert = FindInsertPoint(binding.Priority); var insert = FindInsertPoint(binding.Priority);
_entries.Insert(insert, binding); _entries.Insert(insert, binding);
return binding; return binding;

2
src/Avalonia.Base/ValueStore.cs

@ -121,7 +121,7 @@ namespace Avalonia
} }
else else
{ {
var entry = new BindingEntry<T>(property, source, priority, this); var entry = new BindingEntry<T>(_owner, property, source, priority, this);
_values.AddValue(property, entry); _values.AddValue(property, entry);
entry.Start(); entry.Start();
return entry; return entry;

Loading…
Cancel
Save