Browse Source

No longer need to work around a Splat bug.

pull/4/head
Steven Kirk 12 years ago
parent
commit
0aa671d75f
  1. 12
      Perspex.Base/PerspexObject.cs
  2. 4
      Perspex.Controls/TemplatedControl.cs
  3. 8
      Perspex.Layout/Layoutable.cs
  4. 8
      Perspex.SceneGraph/Visual.cs
  5. 5
      TestApplication/Program.cs

12
Perspex.Base/PerspexObject.cs

@ -457,12 +457,12 @@ namespace Perspex
this.values.Add(property, v); this.values.Add(property, v);
} }
this.Log().Debug(string.Format( this.Log().Debug(
"Set local value of {0}.{1} (#{2:x8}) to {3}", "Set local value of {0}.{1} (#{2:x8}) to {3}",
this.GetType().Name, this.GetType().Name,
property.Name, property.Name,
this.GetHashCode(), this.GetHashCode(),
value)); value);
v.Replace(Observable.Never<object>().StartWith(value), Priority); v.Replace(Observable.Never<object>().StartWith(value), Priority);
} }
@ -506,12 +506,12 @@ namespace Perspex
this.values.Add(property, v); this.values.Add(property, v);
} }
this.Log().Debug(string.Format( this.Log().Debug(
"Bound value of {0}.{1} (#{2:x8}) to {3}", "Bound value of {0}.{1} (#{2:x8}) to {3}",
this.GetType().Name, this.GetType().Name,
property.Name, property.Name,
this.GetHashCode(), this.GetHashCode(),
description != null ? description.Description : "[Anonymous]")); description != null ? description.Description : "[Anonymous]");
if (priority == BindingPriority.LocalValue) if (priority == BindingPriority.LocalValue)
{ {
@ -582,13 +582,13 @@ namespace Perspex
{ {
this.RaisePropertyChanged(property, oldValue, newValue); this.RaisePropertyChanged(property, oldValue, newValue);
this.Log().Debug(string.Format( this.Log().Debug(
"Value of {0}.{1} (#{2:x8}) changed from {3} to {4}", "Value of {0}.{1} (#{2:x8}) changed from {3} to {4}",
this.GetType().Name, this.GetType().Name,
property.Name, property.Name,
this.GetHashCode(), this.GetHashCode(),
oldValue, oldValue,
newValue)); newValue);
} }
}); });

4
Perspex.Controls/TemplatedControl.cs

@ -60,10 +60,10 @@ namespace Perspex.Controls
{ {
if (this.Template != null) if (this.Template != null)
{ {
this.Log().Debug(string.Format( this.Log().Debug(
"Creating template for {0} (#{1:x8})", "Creating template for {0} (#{1:x8})",
this.GetType().Name, this.GetType().Name,
this.GetHashCode())); this.GetHashCode());
var child = this.Template.Build(this); var child = this.Template.Build(this);
this.AddVisualChild(child); this.AddVisualChild(child);

8
Perspex.Layout/Layoutable.cs

@ -125,20 +125,20 @@ namespace Perspex.Layout
availableSize = availableSize.Deflate(this.Margin); availableSize = availableSize.Deflate(this.Margin);
this.DesiredSize = this.MeasureCore(availableSize).Constrain(availableSize); this.DesiredSize = this.MeasureCore(availableSize).Constrain(availableSize);
this.Log().Debug(string.Format( this.Log().Debug(
"Measure of {0} (#{1:x8}) requested {2} ", "Measure of {0} (#{1:x8}) requested {2} ",
this.GetType().Name, this.GetType().Name,
this.GetHashCode(), this.GetHashCode(),
this.DesiredSize)); this.DesiredSize);
} }
public void Arrange(Rect rect) public void Arrange(Rect rect)
{ {
this.Log().Debug(string.Format( this.Log().Debug(
"Arrange of {0} (#{1:x8}) gave {2} ", "Arrange of {0} (#{1:x8}) gave {2} ",
this.GetType().Name, this.GetType().Name,
this.GetHashCode(), this.GetHashCode(),
rect)); rect);
if (this.DesiredSize.HasValue) if (this.DesiredSize.HasValue)
{ {

8
Perspex.SceneGraph/Visual.cs

@ -248,10 +248,10 @@ namespace Perspex
private void NotifyAttachedToVisualTree(IRenderRoot root) private void NotifyAttachedToVisualTree(IRenderRoot root)
{ {
this.Log().Debug(string.Format( this.Log().Debug(
"Attached {0} (#{1:x8}) to visual tree", "Attached {0} (#{1:x8}) to visual tree",
this.GetType().Name, this.GetType().Name,
this.GetHashCode())); this.GetHashCode());
this.OnAttachedToVisualTree(root); this.OnAttachedToVisualTree(root);
@ -266,10 +266,10 @@ namespace Perspex
private void NotifyDetachedFromVisualTree(IRenderRoot oldRoot) private void NotifyDetachedFromVisualTree(IRenderRoot oldRoot)
{ {
this.Log().Debug(string.Format( this.Log().Debug(
"Detached {0} (#{1:x8}) from visual tree", "Detached {0} (#{1:x8}) from visual tree",
this.GetType().Name, this.GetType().Name,
this.GetHashCode())); this.GetHashCode());
this.OnDetachedFromVisualTree(oldRoot); this.OnDetachedFromVisualTree(oldRoot);

5
TestApplication/Program.cs

@ -1,5 +1,6 @@
using Perspex; using Perspex;
using Perspex.Controls; using Perspex.Controls;
using Perspex.Diagnostics;
using Perspex.Layout; using Perspex.Layout;
using Perspex.Media; using Perspex.Media;
using Perspex.Media.Imaging; using Perspex.Media.Imaging;
@ -82,8 +83,8 @@ namespace TestApplication
static void Main(string[] args) static void Main(string[] args)
{ {
//LogManager.Enable(new TestLogger()); LogManager.Enable(new TestLogger());
//LogManager.Instance.LogLayoutMessages = true; LogManager.Instance.LogLayoutMessages = true;
App application = new App App application = new App
{ {

Loading…
Cancel
Save