Browse Source

Things now display correctly.

No keyboard input though.
pull/4/head
Steven Kirk 12 years ago
parent
commit
e696dde0ec
  1. 1
      Perspex.Base/Perspex.Base.csproj
  2. 3
      Perspex.Base/PerspexObject.cs
  3. 8
      Perspex.Controls/ContentPresenter.cs
  4. 2
      Perspex.Layout/LayoutManager.cs

1
Perspex.Base/Perspex.Base.csproj

@ -67,6 +67,7 @@
<ItemGroup> <ItemGroup>
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<Import Project="..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" /> <Import Project="..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

3
Perspex.Base/PerspexObject.cs

@ -13,7 +13,6 @@ namespace Perspex
using System.Reflection; using System.Reflection;
using Splat; using Splat;
/// <summary> /// <summary>
/// The priority of a binding. /// The priority of a binding.
/// </summary> /// </summary>
@ -451,7 +450,7 @@ namespace Perspex
v = this.CreatePriorityValue(property); v = this.CreatePriorityValue(property);
this.values.Add(property, v); this.values.Add(property, v);
} }
this.Log().Debug(string.Format( this.Log().Debug(string.Format(
"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,

8
Perspex.Controls/ContentPresenter.cs

@ -7,11 +7,9 @@
namespace Perspex.Controls namespace Perspex.Controls
{ {
using System; using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reactive.Linq;
using Perspex.Layout; using Perspex.Layout;
using Perspex.Media;
using Perspex.Styling;
public class ContentPresenter : Control, IVisual public class ContentPresenter : Control, IVisual
{ {
@ -23,7 +21,7 @@ namespace Perspex.Controls
public ContentPresenter() public ContentPresenter()
{ {
this.GetObservableWithHistory(ContentProperty).Subscribe(this.ContentChanged); this.GetObservable(ContentProperty).Skip(1).Subscribe(this.ContentChanged);
} }
public object Content public object Content
@ -136,7 +134,7 @@ namespace Perspex.Controls
return new Size(); return new Size();
} }
private void ContentChanged(Tuple<object, object> content) private void ContentChanged(object content)
{ {
this.ClearVisualChildren(); this.ClearVisualChildren();
this.CreateVisualChildren(); this.CreateVisualChildren();

2
Perspex.Layout/LayoutManager.cs

@ -37,8 +37,6 @@ namespace Perspex.Layout
this.root.Measure(this.root.ClientSize); this.root.Measure(this.root.ClientSize);
this.root.Arrange(new Rect(this.root.ClientSize)); this.root.Arrange(new Rect(this.root.ClientSize));
} }
this.root = null;
} }
public void InvalidateMeasure(ILayoutable item) public void InvalidateMeasure(ILayoutable item)

Loading…
Cancel
Save