Browse Source

Removed DeckItem - it's not needed.

pull/58/head
Steven Kirk 11 years ago
parent
commit
566e66d848
  1. 5
      Perspex.Controls/Deck.cs
  2. 25
      Perspex.Controls/DeckItem.cs
  3. 7
      Perspex.Controls/Generators/ItemContainerGenerator.cs
  4. 1
      Perspex.Controls/Perspex.Controls.csproj
  5. 1
      Perspex.SceneGraph/Animation/PageSlide.cs
  6. 38
      Perspex.Themes.Default/DeckItemStyle.cs
  7. 1
      Perspex.Themes.Default/DefaultTheme.cs
  8. 1
      Perspex.Themes.Default/Perspex.Themes.Default.csproj

5
Perspex.Controls/Deck.cs

@ -35,11 +35,6 @@ namespace Perspex.Controls
set { this.SetValue(TransitionProperty, value); }
}
protected override ItemContainerGenerator CreateItemContainerGenerator()
{
return new TypedItemContainerGenerator<DeckItem>(this);
}
protected override void ItemsChanged(IEnumerable oldValue, IEnumerable newValue)
{
base.ItemsChanged(oldValue, newValue);

25
Perspex.Controls/DeckItem.cs

@ -1,25 +0,0 @@
// -----------------------------------------------------------------------
// <copyright file="DeckItem.cs" company="Steven Kirk">
// Copyright 2015 MIT Licence. See licence.md for more information.
// </copyright>
// -----------------------------------------------------------------------
namespace Perspex.Controls
{
public class DeckItem : ContentControl, ISelectable
{
public static readonly PerspexProperty<bool> IsSelectedProperty =
PerspexProperty.Register<DeckItem, bool>("IsSelected");
static DeckItem()
{
Control.PseudoClass(IsSelectedProperty, ":selected");
}
public bool IsSelected
{
get { return this.GetValue(IsSelectedProperty); }
set { this.SetValue(IsSelectedProperty, value); }
}
}
}

7
Perspex.Controls/Generators/ItemContainerGenerator.cs

@ -84,7 +84,12 @@ namespace Perspex.Controls.Generators
foreach (object item in items)
{
Control container = this.CreateContainerOverride(item);
container.DataContext = item;
if (container.DataContext == null)
{
container.DataContext = item;
}
container.TemplatedParent = null;
this.AddInternal(item, container);
result.Add(container);

1
Perspex.Controls/Perspex.Controls.csproj

@ -41,7 +41,6 @@
<Compile Include="IContentControl.cs" />
<Compile Include="IItemsPanel.cs" />
<Compile Include="INavigablePanel.cs" />
<Compile Include="DeckItem.cs" />
<Compile Include="Deck.cs" />
<Compile Include="Platform\IPopupImpl.cs" />
<Compile Include="Platform\ITopLevelImpl.cs" />

1
Perspex.SceneGraph/Animation/PageSlide.cs

@ -45,6 +45,7 @@ namespace Perspex.Animation
{
var transform = new TranslateTransform();
to.RenderTransform = transform;
to.IsVisible = true;
tasks.Add(Animate.Property(
transform,
TranslateTransform.XProperty,

38
Perspex.Themes.Default/DeckItemStyle.cs

@ -1,38 +0,0 @@
// -----------------------------------------------------------------------
// <copyright file="DeckItemStyle.cs" company="Steven Kirk">
// Copyright 2015 MIT Licence. See licence.md for more information.
// </copyright>
// -----------------------------------------------------------------------
namespace Perspex.Themes.Default
{
using Perspex.Controls;
using Perspex.Controls.Presenters;
using Perspex.Styling;
using System.Linq;
public class DeckItemStyle : Styles
{
public DeckItemStyle()
{
this.AddRange(new[]
{
new Style(x => x.OfType<DeckItem>())
{
Setters = new[]
{
new Setter(DeckItem.TemplateProperty, ControlTemplate.Create<DeckItem>(this.Template)),
},
},
});
}
private Control Template(DeckItem control)
{
return new ContentPresenter
{
[~ContentPresenter.ContentProperty] = control[~DeckItem.ContentProperty],
};
}
}
}

1
Perspex.Themes.Default/DefaultTheme.cs

@ -23,7 +23,6 @@ namespace Perspex.Themes.Default
this.Add(new ListBoxStyle());
this.Add(new ListBoxItemStyle());
this.Add(new DeckStyle());
this.Add(new DeckItemStyle());
this.Add(new PopupRootStyle());
this.Add(new RadioButtonStyle());
this.Add(new ScrollBarStyle());

1
Perspex.Themes.Default/Perspex.Themes.Default.csproj

@ -72,7 +72,6 @@
<ItemGroup>
<Compile Include="FocusAdornerStyle.cs" />
<Compile Include="DropDownStyle.cs" />
<Compile Include="DeckItemStyle.cs" />
<Compile Include="DeckStyle.cs" />
<Compile Include="RadioButtonStyle.cs" />
<Compile Include="ToggleButtonStyle.cs" />

Loading…
Cancel
Save