From adee104ad9e7ddc55ca5c892070cf5d7de020492 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 16 Jan 2016 15:20:05 +0100
Subject: [PATCH] DropDown shouldn't be an IContentControl.

---
 src/Perspex.Controls/DropDown.cs              | 54 ++++++++-----------
 src/Perspex.Themes.Default/DropDown.paml      |  6 +--
 .../DropDownTests.cs                          |  2 +-
 3 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/src/Perspex.Controls/DropDown.cs b/src/Perspex.Controls/DropDown.cs
index 6f69fcaeaf..8742016d9c 100644
--- a/src/Perspex.Controls/DropDown.cs
+++ b/src/Perspex.Controls/DropDown.cs
@@ -16,23 +16,20 @@ namespace Perspex.Controls
     /// <summary>
     /// A drop-down list control.
     /// </summary>
-    public class DropDown : SelectingItemsControl, IContentControl
+    public class DropDown : SelectingItemsControl
     {
-        public static readonly PerspexProperty<object> ContentProperty =
-            ContentControl.ContentProperty.AddOwner<DropDown>();
-
-        public static readonly PerspexProperty<HorizontalAlignment> HorizontalContentAlignmentProperty =
-            ContentControl.HorizontalContentAlignmentProperty.AddOwner<DropDown>();
-
-        public static readonly PerspexProperty<VerticalAlignment> VerticalContentAlignmentProperty =
-            ContentControl.VerticalContentAlignmentProperty.AddOwner<DropDown>();
-
+        /// <summary>
+        /// Defines the <see cref="IsDropDownOpen"/> property.
+        /// </summary>
         public static readonly PerspexProperty<bool> IsDropDownOpenProperty =
             PerspexProperty.RegisterDirect<DropDown, bool>(
                 nameof(IsDropDownOpen),
                 o => o.IsDropDownOpen,
                 (o, v) => o.IsDropDownOpen = v);
 
+        /// <summary>
+        /// Defines the <see cref="SelectionBoxItem"/> property.
+        /// </summary>
         public static readonly PerspexProperty<object> SelectionBoxItemProperty =
             PerspexProperty.RegisterDirect<DropDown, object>("SelectionBoxItem", o => o.SelectionBoxItem);
 
@@ -40,58 +37,47 @@ namespace Perspex.Controls
         private Popup _popup;
         private object _selectionBoxItem;
 
+        /// <summary>
+        /// Initializes static members of the <see cref="DropDown"/> class.
+        /// </summary>
         static DropDown()
         {
             FocusableProperty.OverrideDefaultValue<DropDown>(true);
             SelectedItemProperty.Changed.AddClassHandler<DropDown>(x => x.SelectedItemChanged);
         }
 
-        public DropDown()
-        {
-            Bind(ContentProperty, GetObservable(SelectedItemProperty));
-        }
-
-        public object Content
-        {
-            get { return GetValue(ContentProperty); }
-            set { SetValue(ContentProperty, value); }
-        }
-
-        public HorizontalAlignment HorizontalContentAlignment
-        {
-            get { return GetValue(HorizontalContentAlignmentProperty); }
-            set { SetValue(HorizontalContentAlignmentProperty, value); }
-        }
-
-        public VerticalAlignment VerticalContentAlignment
-        {
-            get { return GetValue(VerticalContentAlignmentProperty); }
-            set { SetValue(VerticalContentAlignmentProperty, value); }
-        }
-
+        /// <summary>
+        /// Gets or sets a value indicating whether the dropdown is currently open.
+        /// </summary>
         public bool IsDropDownOpen
         {
             get { return _isDropDownOpen; }
             set { SetAndRaise(IsDropDownOpenProperty, ref _isDropDownOpen, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the item to display as the control's content.
+        /// </summary>
         protected object SelectionBoxItem
         {
             get { return _selectionBoxItem; }
             set { SetAndRaise(SelectionBoxItemProperty, ref _selectionBoxItem, value); }
         }
 
+        /// <inheritdoc/>
         protected override IItemContainerGenerator CreateItemContainerGenerator()
         {
             return new ItemContainerGenerator<DropDownItem>(this, DropDownItem.ContentProperty);
         }
 
+        /// <inheritdoc/>
         protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
         {
             base.OnAttachedToLogicalTree(e);
             this.UpdateSelectionBoxItem(this.SelectedItem);
         }
 
+        /// <inheritdoc/>
         protected override void OnKeyDown(KeyEventArgs e)
         {
             base.OnKeyDown(e);
@@ -112,6 +98,7 @@ namespace Perspex.Controls
             }
         }
 
+        /// <inheritdoc/>
         protected override void OnPointerPressed(PointerPressEventArgs e)
         {
             if (!IsDropDownOpen && ((IVisual)e.Source).GetVisualRoot() != typeof(PopupRoot))
@@ -132,6 +119,7 @@ namespace Perspex.Controls
             base.OnPointerPressed(e);
         }
 
+        /// <inheritdoc/>
         protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
         {
             if (_popup != null)
diff --git a/src/Perspex.Themes.Default/DropDown.paml b/src/Perspex.Themes.Default/DropDown.paml
index 2d65df2c29..d1646ac21c 100644
--- a/src/Perspex.Themes.Default/DropDown.paml
+++ b/src/Perspex.Themes.Default/DropDown.paml
@@ -2,8 +2,6 @@
   <Style Selector="DropDown">
     <Setter Property="BorderBrush" Value="#ff707070"/>
     <Setter Property="BorderThickness" Value="2"/>
-    <Setter Property="HorizontalContentAlignment" Value="Center"/>
-    <Setter Property="VerticalContentAlignment" Value="Center"/>
     <Setter Property="Padding" Value="4"/>
     <Setter Property="Template">
       <ControlTemplate>
@@ -13,8 +11,8 @@
           <Grid ColumnDefinitions="*,Auto">
             <ContentPresenter Content="{TemplateBinding SelectionBoxItem}"
                               Margin="{TemplateBinding Padding}"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                              HorizontalAlignment="Center"
+                              VerticalAlignment="Center"/>
             <ToggleButton Name="toggle"
                           BorderThickness="0"
                           Background="Transparent"
diff --git a/tests/Perspex.Controls.UnitTests/DropDownTests.cs b/tests/Perspex.Controls.UnitTests/DropDownTests.cs
index 29ccfeeb53..3ab2fc73d3 100644
--- a/tests/Perspex.Controls.UnitTests/DropDownTests.cs
+++ b/tests/Perspex.Controls.UnitTests/DropDownTests.cs
@@ -40,7 +40,7 @@ namespace Perspex.Controls.UnitTests
                         new ContentControl
                         {
                             Name = "contentControl",
-                            [~ContentPresenter.ContentProperty] = parent[~DropDown.ContentProperty],
+                            [~ContentPresenter.ContentProperty] = parent[~DropDown.SelectionBoxItemProperty],
                         },
                         new ToggleButton
                         {