Browse Source

DeferStyleChanges -> DeferChanges

pull/4/head
Steven Kirk 12 years ago
parent
commit
f62be9ef3a
  1. 8
      Perspex/Controls/Control.cs
  2. 15
      Perspex/PerspexObject.cs
  3. 4
      Perspex/PriorityValue.cs

8
Perspex/Controls/Control.cs

@ -74,8 +74,8 @@ namespace Perspex.Controls
public Control()
{
this.classes = new Classes();
this.classes.BeforeChanged.Subscribe(x => this.BeginDeferStyleChanges());
this.classes.AfterChanged.Subscribe(x => this.EndDeferStyleChanges());
this.classes.BeforeChanged.Subscribe(x => this.BeginDeferChanges());
this.classes.AfterChanged.Subscribe(x => this.EndDeferChanges());
this.GetObservable(IsMouseOverProperty).Subscribe(x =>
{
@ -151,10 +151,10 @@ namespace Perspex.Controls
{
if (this.classes != value)
{
this.BeginDeferStyleChanges();
this.BeginDeferChanges();
this.classes.Clear();
this.classes.Add(value);
this.EndDeferStyleChanges();
this.EndDeferChanges();
}
}
}

15
Perspex/PerspexObject.cs

@ -95,14 +95,13 @@ namespace Perspex
}
/// <summary>
/// Defers property updates due to style changes until <see cref="EndDeferStyleChanges"/>
/// is called.
/// Defers property change notifications until <see cref="EndDeferChanges"/> is called.
/// </summary>
public void BeginDeferStyleChanges()
public void BeginDeferChanges()
{
foreach (PriorityValue v in this.values.Values)
{
v.BeginDeferStyleChanges();
v.BeginDeferChanges();
}
this.Log().Debug(string.Format(
@ -112,14 +111,14 @@ namespace Perspex
}
/// <summary>
/// Ends the defer of property updates due to style changes initiated by a previous call
/// to <see cref="BeginDeferStyleChanges"/>.
/// Ends the defer of property change notifications initiated by a previous call
/// to <see cref="BeginDeferChanges"/>.
/// </summary>
public void EndDeferStyleChanges()
public void EndDeferChanges()
{
foreach (PriorityValue v in this.values.Values)
{
v.EndDeferStyleChanges();
v.EndDeferChanges();
}
this.Log().Debug(string.Format(

4
Perspex/PriorityValue.cs

@ -116,7 +116,7 @@ namespace Perspex
return Disposable.Create(() => this.observers.Remove(observer));
}
public void BeginDeferStyleChanges()
public void BeginDeferChanges()
{
if (this.defer++ == 0)
{
@ -124,7 +124,7 @@ namespace Perspex
}
}
public void EndDeferStyleChanges()
public void EndDeferChanges()
{
if (this.defer > 0 && --this.defer == 0 && dirty)
{

Loading…
Cancel
Save