@ -1,4 +1,5 @@
using System ; using System ;
using System.Collections.Generic ;
using Avalonia.Data ; using Avalonia.Data ;
using Avalonia.PropertyStore ; using Avalonia.PropertyStore ;
using Avalonia.Utilities ; using Avalonia.Utilities ;
@ -26,6 +27,7 @@ namespace Avalonia
private readonly AvaloniaObject _ owner ; private readonly AvaloniaObject _ owner ;
private readonly IValueSink _ sink ; private readonly IValueSink _ sink ;
private readonly AvaloniaPropertyValueStore < IValue > _ values ; private readonly AvaloniaPropertyValueStore < IValue > _ values ;
private BatchUpdate ? _ batchUpdate ;
public ValueStore ( AvaloniaObject owner ) public ValueStore ( AvaloniaObject owner )
{ {
@ -33,6 +35,25 @@ namespace Avalonia
_ values = new AvaloniaPropertyValueStore < IValue > ( ) ; _ values = new AvaloniaPropertyValueStore < IValue > ( ) ;
} }
public void BeginBatchUpdate ( )
{
_ batchUpdate ? ? = new BatchUpdate ( this ) ;
_ batchUpdate . Begin ( ) ;
}
public void EndBatchUpdate ( )
{
if ( _ batchUpdate is null )
{
throw new InvalidOperationException ( "No batch update in progress." ) ;
}
if ( _ batchUpdate . End ( ) )
{
_ batchUpdate = null ;
}
}
public bool IsAnimating ( AvaloniaProperty property ) public bool IsAnimating ( AvaloniaProperty property )
{ {
if ( _ values . TryGetValue ( property , out var slot ) ) if ( _ values . TryGetValue ( property , out var slot ) )
@ -90,23 +111,21 @@ namespace Avalonia
{ {
// If the property has any coercion callbacks then always create a PriorityValue.
// If the property has any coercion callbacks then always create a PriorityValue.
var entry = new PriorityValue < T > ( _ owner , property , this ) ; var entry = new PriorityValue < T > ( _ owner , property , this ) ;
_ values . AddValue ( property , entry ) ; AddValue ( property , entry ) ;
result = entry . SetValue ( value , priority ) ; result = entry . SetValue ( value , priority ) ;
} }
else else
{ {
var change = new AvaloniaPropertyChangedEventArgs < T > ( _ owner , property , default , value , priority ) ;
if ( priority = = BindingPriority . LocalValue ) if ( priority = = BindingPriority . LocalValue )
{ {
_ values . AddValue ( property , new LocalValueEntry < T > ( value ) ) ; AddValue ( property , new LocalValueEntry < T > ( value ) ) ;
_ sink . ValueChanged ( change ) ; NotifyValueChanged < T > ( property , default , value , priority ) ;
} }
else else
{ {
var entry = new ConstantValueEntry < T > ( property , value , priority , this ) ; var entry = new ConstantValueEntry < T > ( property , value , priority , this ) ;
_ values . AddValue ( property , entry ) ; AddValue ( property , entry ) ;
_ sink . ValueChanged ( change ) ; NotifyValueChanged < T > ( property , default , value , priority ) ;
result = entry ; result = entry ;
} }
} }
@ -128,15 +147,13 @@ namespace Avalonia
// If the property has any coercion callbacks then always create a PriorityValue.
// If the property has any coercion callbacks then always create a PriorityValue.
var entry = new PriorityValue < T > ( _ owner , property , this ) ; var entry = new PriorityValue < T > ( _ owner , property , this ) ;
var binding = entry . AddBinding ( source , priority ) ; var binding = entry . AddBinding ( source , priority ) ;
_ values . AddValue ( property , entry ) ; AddValue ( property , entry ) ;
binding . Start ( ) ;
return binding ; return binding ;
} }
else else
{ {
var entry = new BindingEntry < T > ( _ owner , property , source , priority , this ) ; var entry = new BindingEntry < T > ( _ owner , property , source , priority , this ) ;
_ values . AddValue ( property , entry ) ; AddValue ( property , entry ) ;
entry . Start ( ) ;
return entry ; return entry ;
} }
} }
@ -149,23 +166,32 @@ namespace Avalonia
{ {
p . ClearLocalValue ( ) ; p . ClearLocalValue ( ) ;
} }
else else if ( slot . Priority = = BindingPriority . LocalValue )
{ {
var remove = slot is ConstantValueEntry < T > c ? var old = TryGetValue ( property , BindingPriority . LocalValue , out var value ) ? value : default ;
c . Priority = = BindingPriority . LocalValue :
! ( slot is IPriorityValueEntry < T > ) ;
if ( remove ) // During batch update values can't be removed immediately because they're needed to raise
// a correctly-typed _sink.ValueChanged notification. They instead mark themselves for removal
// by setting their priority to Unset.
if ( _ batchUpdate is null )
{ {
var old = TryGetValue ( property , BindingPriority . LocalValue , out var value ) ? value : default ;
_ values . Remove ( property ) ; _ values . Remove ( property ) ;
_ sink . ValueChanged ( new AvaloniaPropertyChangedEventArgs < T > (
_ owner ,
property ,
new Optional < T > ( old ) ,
default ,
BindingPriority . Unset ) ) ;
} }
else if ( slot is IDisposable d )
{
d . Dispose ( ) ;
}
else
{
// Local value entries are optimized and contain only a single value field to save space,
// so there's no way to mark them for removal at the end of a batch update. Instead convert
// them to a constant value entry with Unset priority in the event of a local value being
// cleared during a batch update.
var sentinel = new ConstantValueEntry < T > ( property , default , BindingPriority . Unset , _ sink ) ;
_ values . SetValue ( property , sentinel ) ;
}
NotifyValueChanged < T > ( property , old , default , BindingPriority . Unset ) ;
} }
} }
} }
@ -176,7 +202,7 @@ namespace Avalonia
{ {
if ( slot is PriorityValue < T > p ) if ( slot is PriorityValue < T > p )
{ {
p . Coerc eValue( ) ; p . UpdateEffectiv eValue( ) ;
} }
} }
} }
@ -198,7 +224,17 @@ namespace Avalonia
void IValueSink . ValueChanged < T > ( AvaloniaPropertyChangedEventArgs < T > change ) void IValueSink . ValueChanged < T > ( AvaloniaPropertyChangedEventArgs < T > change )
{ {
_ sink . ValueChanged ( change ) ; if ( _ batchUpdate is object )
{
if ( change . IsEffectiveValueChange )
{
NotifyValueChanged < T > ( change . Property , change . OldValue , change . NewValue , change . Priority ) ;
}
}
else
{
_ sink . ValueChanged ( change ) ;
}
} }
void IValueSink . Completed < T > ( void IValueSink . Completed < T > (
@ -206,13 +242,17 @@ namespace Avalonia
IPriorityValueEntry entry , IPriorityValueEntry entry ,
Optional < T > oldValue ) Optional < T > oldValue )
{ {
if ( _ values . TryGetValue ( property , out var slot ) ) if ( _ values . TryGetValue ( property , out var slot ) & & slot = = entry )
{ {
if ( slot = = entry ) if ( _ batchUpdate is null )
{ {
_ values . Remove ( property ) ; _ values . Remove ( property ) ;
_ sink . Completed ( property , entry , oldValue ) ; _ sink . Completed ( property , entry , oldValue ) ;
} }
else
{
_ batchUpdate . ValueChanged ( property , oldValue . ToObject ( ) ) ;
}
} }
} }
@ -240,16 +280,13 @@ namespace Avalonia
{ {
var old = l . GetValue ( BindingPriority . LocalValue ) ; var old = l . GetValue ( BindingPriority . LocalValue ) ;
l . SetValue ( value ) ; l . SetValue ( value ) ;
_ sink . ValueChanged ( new AvaloniaPropertyChangedEventArgs < T > ( NotifyValueChanged < T > ( property , old , value , priority ) ;
_ owner ,
property ,
old ,
value ,
priority ) ) ;
} }
else else
{ {
var priorityValue = new PriorityValue < T > ( _ owner , property , this , l ) ; var priorityValue = new PriorityValue < T > ( _ owner , property , this , l ) ;
if ( _ batchUpdate is object )
priorityValue . BeginBatchUpdate ( ) ;
result = priorityValue . SetValue ( value , priority ) ; result = priorityValue . SetValue ( value , priority ) ;
_ values . SetValue ( property , priorityValue ) ; _ values . SetValue ( property , priorityValue ) ;
} }
@ -273,6 +310,11 @@ namespace Avalonia
if ( slot is IPriorityValueEntry < T > e ) if ( slot is IPriorityValueEntry < T > e )
{ {
priorityValue = new PriorityValue < T > ( _ owner , property , this , e ) ; priorityValue = new PriorityValue < T > ( _ owner , property , this , e ) ;
if ( _ batchUpdate is object )
{
priorityValue . BeginBatchUpdate ( ) ;
}
} }
else if ( slot is PriorityValue < T > p ) else if ( slot is PriorityValue < T > p )
{ {
@ -289,8 +331,162 @@ namespace Avalonia
var binding = priorityValue . AddBinding ( source , priority ) ; var binding = priorityValue . AddBinding ( source , priority ) ;
_ values . SetValue ( property , priorityValue ) ; _ values . SetValue ( property , priorityValue ) ;
binding . Start ( ) ; priorityValue . UpdateEffectiveValue ( ) ;
return binding ; return binding ;
} }
private void AddValue ( AvaloniaProperty property , IValue value )
{
_ values . AddValue ( property , value ) ;
if ( _ batchUpdate is object & & value is IBatchUpdate batch )
batch . BeginBatchUpdate ( ) ;
value . Start ( ) ;
}
private void NotifyValueChanged < T > (
AvaloniaProperty < T > property ,
Optional < T > oldValue ,
BindingValue < T > newValue ,
BindingPriority priority )
{
if ( _ batchUpdate is null )
{
_ sink . ValueChanged ( new AvaloniaPropertyChangedEventArgs < T > (
_ owner ,
property ,
oldValue ,
newValue ,
priority ) ) ;
}
else
{
_ batchUpdate . ValueChanged ( property , oldValue . ToObject ( ) ) ;
}
}
private class BatchUpdate
{
private ValueStore _ owner ;
private List < Notification > ? _ notifications ;
private int _ batchUpdateCount ;
private int _ iterator = - 1 ;
public BatchUpdate ( ValueStore owner ) = > _ owner = owner ;
public void Begin ( )
{
if ( _ batchUpdateCount + + = = 0 )
{
var values = _ owner . _ values ;
for ( var i = 0 ; i < values . Count ; + + i )
{
( values [ i ] as IBatchUpdate ) ? . BeginBatchUpdate ( ) ;
}
}
}
public bool End ( )
{
if ( - - _ batchUpdateCount > 0 )
return false ;
var values = _ owner . _ values ;
// First call EndBatchUpdate on all bindings. This should cause the active binding to be subscribed
// but notifications will still not be raised because the owner ValueStore will still have a reference
// to this batch update object.
for ( var i = 0 ; i < values . Count ; + + i )
{
( values [ i ] as IBatchUpdate ) ? . EndBatchUpdate ( ) ;
// Somehow subscribing to a binding caused a new batch update. This shouldn't happen but in case it
// does, abort and continue batch updating.
if ( _ batchUpdateCount > 0 )
return false ;
}
if ( _ notifications is object )
{
// Raise all batched notifications. Doing this can cause other notifications to be added and even
// cause a new batch update to start, so we need to handle _notifications being modified by storing
// the index in field.
_ iterator = 0 ;
for ( ; _ iterator < _ notifications . Count ; + + _ iterator )
{
var entry = _ notifications [ _ iterator ] ;
if ( values . TryGetValue ( entry . property , out var slot ) )
{
var oldValue = entry . oldValue ;
var newValue = slot . GetValue ( ) ;
// Raising this notification can cause a new batch update to be started, which in turn
// results in another change to the property. In this case we need to update the old value
// so that the *next* notification has an oldValue which follows on from the newValue
// raised here.
_ notifications [ _ iterator ] = new Notification
{
property = entry . property ,
oldValue = newValue ,
} ;
// Call _sink.ValueChanged with an appropriately typed AvaloniaPropertyChangedEventArgs<T>.
slot . RaiseValueChanged ( _ owner . _ sink , _ owner . _ owner , entry . property , oldValue , newValue ) ;
// During batch update values can't be removed immediately because they're needed to raise
// the _sink.ValueChanged notification. They instead mark themselves for removal by setting
// their priority to Unset.
if ( slot . Priority = = BindingPriority . Unset )
{
values . Remove ( entry . property ) ;
}
}
else
{
throw new AvaloniaInternalException ( "Value could not be found at the end of batch update." ) ;
}
// If a new batch update was started while ending this one, abort.
if ( _ batchUpdateCount > 0 )
return false ;
}
}
_ iterator = int . MaxValue - 1 ;
return true ;
}
public void ValueChanged ( AvaloniaProperty property , Optional < object > oldValue )
{
_ notifications ? ? = new List < Notification > ( ) ;
for ( var i = 0 ; i < _ notifications . Count ; + + i )
{
if ( _ notifications [ i ] . property = = property )
{
oldValue = _ notifications [ i ] . oldValue ;
_ notifications . RemoveAt ( i ) ;
if ( i < = _ iterator )
- - _ iterator ;
break ;
}
}
_ notifications . Add ( new Notification
{
property = property ,
oldValue = oldValue ,
} ) ;
}
private struct Notification
{
public AvaloniaProperty property ;
public Optional < object > oldValue ;
}
}
} }
} }
Jumar Macato
6 years ago
