From 5db655fe871cce68a04197d7791e6c304abcfcac Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Mon, 24 Aug 2015 23:20:58 +0200 Subject: [PATCH] Make TabControl show from XAML. --- Perspex.Controls/ItemsControl.cs | 3 ++- Perspex.Themes.Default/TabControlStyle.cs | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Perspex.Controls/ItemsControl.cs b/Perspex.Controls/ItemsControl.cs index 18b60add05..9c1d99681e 100644 --- a/Perspex.Controls/ItemsControl.cs +++ b/Perspex.Controls/ItemsControl.cs @@ -36,7 +36,7 @@ namespace Perspex.Controls /// Defines the property. /// public static readonly PerspexProperty ItemsProperty = - PerspexProperty.Register("Items", defaultValue: new Collection()); + PerspexProperty.Register("Items"); /// /// Defines the property. @@ -60,6 +60,7 @@ namespace Perspex.Controls public ItemsControl() { this.Classes.Add(":empty"); + this.Items = new PerspexList(); } /// diff --git a/Perspex.Themes.Default/TabControlStyle.cs b/Perspex.Themes.Default/TabControlStyle.cs index 88a2d17ad9..fe5c941858 100644 --- a/Perspex.Themes.Default/TabControlStyle.cs +++ b/Perspex.Themes.Default/TabControlStyle.cs @@ -43,7 +43,7 @@ namespace Perspex.Themes.Default new TabStrip { Name = "tabStrip", - [~TabStrip.ItemsProperty] = control[~TabControl.ItemsProperty], + [!TabStrip.ItemsProperty] = control[!TabControl.ItemsProperty], [!!TabStrip.SelectedItemProperty] = control[!!TabControl.SelectedItemProperty], }, new Deck @@ -53,7 +53,7 @@ namespace Perspex.Themes.Default { new DataTemplate(x => (Control)control.MaterializeDataTemplate(x.Content)), }, - [~Deck.ItemsProperty] = control[~TabControl.ItemsProperty], + [!Deck.ItemsProperty] = control[!TabControl.ItemsProperty], [!Deck.SelectedItemProperty] = control[!TabControl.SelectedItemProperty], [~Deck.TransitionProperty] = control[~TabControl.TransitionProperty], [Grid.RowProperty] = 1,