Browse Source

Added Controls.Primitives namespace

For controls that are only supposed to be used as the base for other
controls.
pull/4/head
Steven Kirk 12 years ago
parent
commit
ec0b43d388
  1. 1
      Perspex.Controls.UnitTests/ContentControlTests.cs
  2. 2
      Perspex.Controls.UnitTests/TemplatedControlTests.cs
  3. 5
      Perspex.Controls.UnitTests/TestTemplatedControl.cs
  4. 2
      Perspex.Controls/CheckBox.cs
  5. 4
      Perspex.Controls/ContentControl.cs
  6. 1
      Perspex.Controls/ItemsControl.cs
  7. 12
      Perspex.Controls/Perspex.Controls.csproj
  8. 2
      Perspex.Controls/Primitives/HeaderedContentControl.cs
  9. 7
      Perspex.Controls/Primitives/HeaderedItemsControl.cs
  10. 2
      Perspex.Controls/Primitives/SelectingItemsControl.cs
  11. 2
      Perspex.Controls/Primitives/TabStrip.cs
  12. 2
      Perspex.Controls/Primitives/TemplatedControl.cs
  13. 2
      Perspex.Controls/Primitives/ToggleButton.cs
  14. 1
      Perspex.Controls/TabControl.cs
  15. 2
      Perspex.Controls/TabItem.cs
  16. 1
      Perspex.Controls/TextBox.cs
  17. 3
      Perspex.Controls/TreeView.cs
  18. 1
      Perspex.Controls/TreeViewItem.cs
  19. 1
      Perspex.Themes.Default/ButtonStyle.cs
  20. 1
      Perspex.Themes.Default/CheckBoxStyle.cs
  21. 1
      Perspex.Themes.Default/ContentControlStyle.cs
  22. 1
      Perspex.Themes.Default/ItemsControlStyle.cs
  23. 2
      Perspex.Themes.Default/TabControlStyle.cs
  24. 1
      Perspex.Themes.Default/TabItemStyle.cs
  25. 2
      Perspex.Themes.Default/TabStripStyle.cs
  26. 2
      Perspex.Themes.Default/TreeViewItemStyle.cs
  27. 1
      Perspex.Themes.Default/TreeViewStyle.cs
  28. 2
      Perspex.Windows/Threading/WindowsDispatcher.cs
  29. 1
      Perspex.Windows/Window.cs

1
Perspex.Controls.UnitTests/ContentControlTests.cs

@ -11,6 +11,7 @@ namespace Perspex.Controls.UnitTests
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
using Perspex.Controls;
using Perspex.Controls.Presenters;
using Perspex.Layout;
using Perspex.Styling;
using Splat;

2
Perspex.Controls.UnitTests/TemplatedControlTests.cs

@ -4,7 +4,6 @@
// </copyright>
// -----------------------------------------------------------------------
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace Perspex.Controls.UnitTests
{
using System;
@ -14,6 +13,7 @@ namespace Perspex.Controls.UnitTests
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Perspex.Controls;
using Perspex.Controls.Primitives;
[TestClass]
public class TemplatedControlTests

5
Perspex.Controls.UnitTests/TestTemplatedControl.cs

@ -6,10 +6,7 @@
namespace Perspex.Controls.UnitTests
{
using System;
using Moq;
using Perspex.Layout;
using Perspex.Rendering;
using Perspex.Controls.Primitives;
internal class TestTemplatedControl : TemplatedControl
{

2
Perspex.Controls/CheckBox.cs

@ -4,6 +4,8 @@
// </copyright>
// -----------------------------------------------------------------------
using Perspex.Controls.Primitives;
namespace Perspex.Controls
{
public class CheckBox : ToggleButton

4
Perspex.Controls/ContentControl.cs

@ -6,9 +6,7 @@
namespace Perspex.Controls
{
using System;
using System.Collections.Generic;
using System.Linq;
using Perspex.Controls.Primitives;
public class ContentControl : TemplatedControl
{

1
Perspex.Controls/ItemsControl.cs

@ -11,6 +11,7 @@ namespace Perspex.Controls
using System.ComponentModel;
using System.Linq;
using Perspex.Controls.Generators;
using Perspex.Controls.Primitives;
public class ItemsControl : TemplatedControl
{

12
Perspex.Controls/Perspex.Controls.csproj

@ -56,8 +56,8 @@
<Compile Include="DefinitionBase.cs" />
<Compile Include="Grid.cs" />
<Compile Include="GridLength.cs" />
<Compile Include="HeaderedContentControl.cs" />
<Compile Include="HeaderedItemsControl.cs" />
<Compile Include="Primitives\HeaderedContentControl.cs" />
<Compile Include="Primitives\HeaderedItemsControl.cs" />
<Compile Include="IHeadered.cs" />
<Compile Include="Image.cs" />
<Compile Include="Generators\IItemContainerGenerator.cs" />
@ -67,19 +67,19 @@
<Compile Include="Panel.cs" />
<Compile Include="RowDefinition.cs" />
<Compile Include="RowDefinitions.cs" />
<Compile Include="SelectingItemsControl.cs" />
<Compile Include="Primitives\SelectingItemsControl.cs" />
<Compile Include="Shapes\Path.cs" />
<Compile Include="Shapes\Rectangle.cs" />
<Compile Include="Shapes\Shape.cs" />
<Compile Include="StackPanel.cs" />
<Compile Include="TabControl.cs" />
<Compile Include="TabItem.cs" />
<Compile Include="TabStrip.cs" />
<Compile Include="TemplatedControl.cs" />
<Compile Include="Primitives\TabStrip.cs" />
<Compile Include="Primitives\TemplatedControl.cs" />
<Compile Include="TextBlock.cs" />
<Compile Include="TextBox.cs" />
<Compile Include="TextBoxView.cs" />
<Compile Include="ToggleButton.cs" />
<Compile Include="Primitives\ToggleButton.cs" />
<Compile Include="TreeDataTemplate.cs" />
<Compile Include="TreeView.cs" />
<Compile Include="TreeViewItem.cs" />

2
Perspex.Controls/HeaderedContentControl.cs → Perspex.Controls/Primitives/HeaderedContentControl.cs

@ -4,7 +4,7 @@
// </copyright>
// -----------------------------------------------------------------------
namespace Perspex.Controls
namespace Perspex.Controls.Primitives
{
using System;
using System.Collections.Generic;

7
Perspex.Controls/HeaderedItemsControl.cs → Perspex.Controls/Primitives/HeaderedItemsControl.cs

@ -4,13 +4,8 @@
// </copyright>
// -----------------------------------------------------------------------
namespace Perspex.Controls
namespace Perspex.Controls.Primitives
{
using System;
using System.Collections;
using System.Linq;
using System.Reactive.Linq;
public class HeaderedItemsControl : ItemsControl
{
public static readonly PerspexProperty<object> HeaderProperty =

2
Perspex.Controls/SelectingItemsControl.cs → Perspex.Controls/Primitives/SelectingItemsControl.cs

@ -4,7 +4,7 @@
// </copyright>
// -----------------------------------------------------------------------
namespace Perspex.Controls
namespace Perspex.Controls.Primitives
{
public class SelectingItemsControl : ItemsControl
{

2
Perspex.Controls/TabStrip.cs → Perspex.Controls/Primitives/TabStrip.cs

@ -4,7 +4,7 @@
// </copyright>
// -----------------------------------------------------------------------
namespace Perspex.Controls
namespace Perspex.Controls.Primitives
{
using System;
using System.Collections;

2
Perspex.Controls/TemplatedControl.cs → Perspex.Controls/Primitives/TemplatedControl.cs

@ -4,7 +4,7 @@
// </copyright>
// -----------------------------------------------------------------------
namespace Perspex.Controls
namespace Perspex.Controls.Primitives
{
using System;
using System.Collections.Generic;

2
Perspex.Controls/ToggleButton.cs → Perspex.Controls/Primitives/ToggleButton.cs

@ -4,7 +4,7 @@
// </copyright>
// -----------------------------------------------------------------------
namespace Perspex.Controls
namespace Perspex.Controls.Primitives
{
using System;

1
Perspex.Controls/TabControl.cs

@ -10,6 +10,7 @@ namespace Perspex.Controls
using System.Linq;
using System.Reactive.Linq;
using Perspex.Controls.Generators;
using Perspex.Controls.Primitives;
public class TabControl : SelectingItemsControl
{

2
Perspex.Controls/TabItem.cs

@ -6,6 +6,8 @@
namespace Perspex.Controls
{
using Perspex.Controls.Primitives;
public class TabItem : HeaderedContentControl
{
public static readonly PerspexProperty<bool> IsSelectedProperty =

1
Perspex.Controls/TextBox.cs

@ -8,6 +8,7 @@ namespace Perspex.Controls
{
using System;
using System.Linq;
using Perspex.Controls.Primitives;
using Perspex.Input;
using Perspex.Platform;
using Perspex.Styling;

3
Perspex.Controls/TreeView.cs

@ -6,12 +6,11 @@
namespace Perspex.Controls
{
using System;
using System.Collections;
using System.Linq;
using System.Reactive.Linq;
using Perspex.Controls.Generators;
using Perspex.Controls.Presenters;
using Perspex.Controls.Primitives;
using Perspex.Input;
public class TreeView : SelectingItemsControl

1
Perspex.Controls/TreeViewItem.cs

@ -9,6 +9,7 @@ namespace Perspex.Controls
using System;
using System.Linq;
using Perspex.Controls.Generators;
using Perspex.Controls.Primitives;
public class TreeViewItem : HeaderedItemsControl
{

1
Perspex.Themes.Default/ButtonStyle.cs

@ -8,6 +8,7 @@ namespace Perspex.Themes.Default
{
using System.Linq;
using Perspex.Controls;
using Perspex.Controls.Presenters;
using Perspex.Media;
using Perspex.Styling;

1
Perspex.Themes.Default/CheckBoxStyle.cs

@ -13,6 +13,7 @@ namespace Perspex.Themes.Default
using Perspex.Media;
using Perspex.Controls.Shapes;
using Perspex.Styling;
using Perspex.Controls.Presenters;
public class CheckBoxStyle : Styles
{

1
Perspex.Themes.Default/ContentControlStyle.cs

@ -8,6 +8,7 @@ namespace Perspex.Themes.Default
{
using System.Linq;
using Perspex.Controls;
using Perspex.Controls.Presenters;
using Perspex.Media;
using Perspex.Styling;

1
Perspex.Themes.Default/ItemsControlStyle.cs

@ -8,6 +8,7 @@ namespace Perspex.Themes.Default
{
using System.Linq;
using Perspex.Controls;
using Perspex.Controls.Presenters;
using Perspex.Styling;
public class ItemsControlStyle : Styles

2
Perspex.Themes.Default/TabControlStyle.cs

@ -9,6 +9,8 @@ namespace Perspex.Themes.Default
using System.Linq;
using System.Reactive.Linq;
using Perspex.Controls;
using Perspex.Controls.Presenters;
using Perspex.Controls.Primitives;
using Perspex.Styling;
public class TabControlStyle : Styles

1
Perspex.Themes.Default/TabItemStyle.cs

@ -8,6 +8,7 @@ namespace Perspex.Themes.Default
{
using System.Linq;
using Perspex.Controls;
using Perspex.Controls.Presenters;
using Perspex.Media;
using Perspex.Styling;

2
Perspex.Themes.Default/TabStripStyle.cs

@ -8,6 +8,8 @@ namespace Perspex.Themes.Default
{
using System.Linq;
using Perspex.Controls;
using Perspex.Controls.Presenters;
using Perspex.Controls.Primitives;
using Perspex.Styling;
public class TabStripStyle : Styles

2
Perspex.Themes.Default/TreeViewItemStyle.cs

@ -12,6 +12,8 @@ namespace Perspex.Themes.Default
using Perspex.Media;
using Perspex.Controls.Shapes;
using Perspex.Styling;
using Perspex.Controls.Presenters;
using Perspex.Controls.Primitives;
public class TreeViewItemStyle : Styles
{

1
Perspex.Themes.Default/TreeViewStyle.cs

@ -8,6 +8,7 @@ namespace Perspex.Themes.Default
{
using System.Linq;
using Perspex.Controls;
using Perspex.Controls.Presenters;
using Perspex.Media;
using Perspex.Styling;

2
Perspex.Windows/Threading/WindowsDispatcher.cs

@ -1,5 +1,5 @@
// -----------------------------------------------------------------------
// <copyright file="Dispatcher.cs" company="Steven Kirk">
// <copyright file="WindowsDispatcher.cs" company="Steven Kirk">
// Copyright 2013 MIT Licence. See licence.md for more information.
// </copyright>
// -----------------------------------------------------------------------

1
Perspex.Windows/Window.cs

@ -12,6 +12,7 @@ namespace Perspex.Windows
using System.Reactive.Linq;
using System.Runtime.InteropServices;
using Perspex.Controls;
using Perspex.Controls.Presenters;
using Perspex.Diagnostics;
using Perspex.Input;
using Perspex.Input.Raw;

Loading…
Cancel
Save