From f62be9ef3ae22d2cf759653dcd481f9bd0e539f3 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Thu, 27 Mar 2014 22:23:15 +0100 Subject: [PATCH] DeferStyleChanges -> DeferChanges --- Perspex/Controls/Control.cs | 8 ++++---- Perspex/PerspexObject.cs | 15 +++++++-------- Perspex/PriorityValue.cs | 4 ++-- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/Perspex/Controls/Control.cs b/Perspex/Controls/Control.cs index 32ef7e717a..e6958a667b 100644 --- a/Perspex/Controls/Control.cs +++ b/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(); } } } diff --git a/Perspex/PerspexObject.cs b/Perspex/PerspexObject.cs index 217e454704..e738c5b039 100644 --- a/Perspex/PerspexObject.cs +++ b/Perspex/PerspexObject.cs @@ -95,14 +95,13 @@ namespace Perspex } /// - /// Defers property updates due to style changes until - /// is called. + /// Defers property change notifications until is called. /// - 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 } /// - /// Ends the defer of property updates due to style changes initiated by a previous call - /// to . + /// Ends the defer of property change notifications initiated by a previous call + /// to . /// - public void EndDeferStyleChanges() + public void EndDeferChanges() { foreach (PriorityValue v in this.values.Values) { - v.EndDeferStyleChanges(); + v.EndDeferChanges(); } this.Log().Debug(string.Format( diff --git a/Perspex/PriorityValue.cs b/Perspex/PriorityValue.cs index 5cc6468286..f621b55f12 100644 --- a/Perspex/PriorityValue.cs +++ b/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) {