From 566e66d848393495ecec81f091154da2a8644599 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 5 May 2015 17:21:33 +0200
Subject: [PATCH] Removed DeckItem - it's not needed.

---
 Perspex.Controls/Deck.cs                      |  5 ---
 Perspex.Controls/DeckItem.cs                  | 25 ------------
 .../Generators/ItemContainerGenerator.cs      |  7 +++-
 Perspex.Controls/Perspex.Controls.csproj      |  1 -
 Perspex.SceneGraph/Animation/PageSlide.cs     |  1 +
 Perspex.Themes.Default/DeckItemStyle.cs       | 38 -------------------
 Perspex.Themes.Default/DefaultTheme.cs        |  1 -
 .../Perspex.Themes.Default.csproj             |  1 -
 8 files changed, 7 insertions(+), 72 deletions(-)
 delete mode 100644 Perspex.Controls/DeckItem.cs
 delete mode 100644 Perspex.Themes.Default/DeckItemStyle.cs

diff --git a/Perspex.Controls/Deck.cs b/Perspex.Controls/Deck.cs
index 735e04fabf..dd103953b6 100644
--- a/Perspex.Controls/Deck.cs
+++ b/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);
diff --git a/Perspex.Controls/DeckItem.cs b/Perspex.Controls/DeckItem.cs
deleted file mode 100644
index 4def87b526..0000000000
--- a/Perspex.Controls/DeckItem.cs
+++ /dev/null
@@ -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); }
-        }
-    }
-}
diff --git a/Perspex.Controls/Generators/ItemContainerGenerator.cs b/Perspex.Controls/Generators/ItemContainerGenerator.cs
index bdcfd665b7..1505bc15cd 100644
--- a/Perspex.Controls/Generators/ItemContainerGenerator.cs
+++ b/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);
diff --git a/Perspex.Controls/Perspex.Controls.csproj b/Perspex.Controls/Perspex.Controls.csproj
index 3551d7aa15..c03c2d568d 100644
--- a/Perspex.Controls/Perspex.Controls.csproj
+++ b/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" />
diff --git a/Perspex.SceneGraph/Animation/PageSlide.cs b/Perspex.SceneGraph/Animation/PageSlide.cs
index 110eb25de1..30195a8f3c 100644
--- a/Perspex.SceneGraph/Animation/PageSlide.cs
+++ b/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,
diff --git a/Perspex.Themes.Default/DeckItemStyle.cs b/Perspex.Themes.Default/DeckItemStyle.cs
deleted file mode 100644
index c60382f374..0000000000
--- a/Perspex.Themes.Default/DeckItemStyle.cs
+++ /dev/null
@@ -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],
-            };
-        }
-    }
-}
diff --git a/Perspex.Themes.Default/DefaultTheme.cs b/Perspex.Themes.Default/DefaultTheme.cs
index 59d3b208e3..2cc162b1de 100644
--- a/Perspex.Themes.Default/DefaultTheme.cs
+++ b/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());
diff --git a/Perspex.Themes.Default/Perspex.Themes.Default.csproj b/Perspex.Themes.Default/Perspex.Themes.Default.csproj
index ec57ba1004..4d3dfece80 100644
--- a/Perspex.Themes.Default/Perspex.Themes.Default.csproj
+++ b/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" />