Browse Source

Moved Popup to Primitives namespace.

pull/72/merge
Steven Kirk 11 years ago
parent
commit
85dfbbb6d5
  1. 4
      Perspex.Controls/Perspex.Controls.csproj
  2. 2
      Perspex.Controls/Primitives/Popup.cs
  3. 2
      Perspex.Controls/Primitives/PopupRoot.cs
  4. 5
      Perspex.Controls/ToolTip.cs
  5. 1
      Perspex.Themes.Default/PopupRootStyle.cs
  6. 2
      Tests/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj
  7. 3
      Tests/Perspex.Controls.UnitTests/Primitives/PopupTests.cs

4
Perspex.Controls/Perspex.Controls.csproj

@ -60,7 +60,7 @@
<Compile Include="Platform\IPopupImpl.cs" />
<Compile Include="Platform\ITopLevelImpl.cs" />
<Compile Include="PlacementMode.cs" />
<Compile Include="Popup.cs" />
<Compile Include="Primitives\Popup.cs" />
<Compile Include="Templates\ControlTemplate`2.cs" />
<Compile Include="Templates\DataTemplate`1.cs" />
<Compile Include="Templates\IControlTemplate.cs" />
@ -126,7 +126,7 @@
<Compile Include="Utils\IEnumerableUtils.cs" />
<Compile Include="Utils\StringUtils.cs" />
<Compile Include="TopLevel.cs" />
<Compile Include="PopupRoot.cs" />
<Compile Include="Primitives\PopupRoot.cs" />
<Compile Include="Window.cs" />
<Compile Include="RowDefinition.cs" />
<Compile Include="RowDefinitions.cs" />

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

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

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

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

5
Perspex.Controls/ToolTip.cs

@ -6,11 +6,12 @@
namespace Perspex.Controls
{
using Perspex.Input;
using Perspex.Threading;
using System;
using System.Reactive.Linq;
using System.Reactive.Subjects;
using Perspex.Controls.Primitives;
using Perspex.Input;
using Perspex.Threading;
/// <summary>
/// A tooltip control.

1
Perspex.Themes.Default/PopupRootStyle.cs

@ -9,6 +9,7 @@ namespace Perspex.Themes.Default
using System.Linq;
using Perspex.Controls;
using Perspex.Controls.Presenters;
using Perspex.Controls.Primitives;
using Perspex.Controls.Templates;
using Perspex.Styling;

2
Tests/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj

@ -93,7 +93,7 @@
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="Mixins\SelectableMixinTests.cs" />
<Compile Include="Parsers\GridLengthsParserTests.cs" />
<Compile Include="PopupTests.cs" />
<Compile Include="Primitives\PopupTests.cs" />
<Compile Include="DropDownTests.cs" />
<Compile Include="Presenters\DeckPresenterTests.cs" />
<Compile Include="Presenters\ItemsPresenterTests.cs" />

3
Tests/Perspex.Controls.UnitTests/PopupTests.cs → Tests/Perspex.Controls.UnitTests/Primitives/PopupTests.cs

@ -4,10 +4,11 @@
// </copyright>
// -----------------------------------------------------------------------
namespace Perspex.Controls.UnitTests
namespace Perspex.Controls.UnitTests.Primitives
{
using System.Collections.Specialized;
using System.Linq;
using Perspex.Controls.Primitives;
using Perspex.LogicalTree;
using Xunit;
Loading…
Cancel
Save