Browse Source

Merge pull request #310 from wieslawsoltes/separator

Added Separator control
pull/315/head
Steven Kirk 11 years ago
parent
commit
7bdf58fcc7
  1. 5
      samples/XamlTestApplicationPcl/Views/MainWindow.paml
  2. 1
      src/Perspex.Controls/Perspex.Controls.csproj
  3. 19
      src/Perspex.Controls/Separator.cs
  4. 1
      src/Perspex.Themes.Default/DefaultTheme.paml
  5. 3
      src/Perspex.Themes.Default/Perspex.Themes.Default.csproj
  6. 17
      src/Perspex.Themes.Default/Separator.paml

5
samples/XamlTestApplicationPcl/Views/MainWindow.paml

@ -8,7 +8,12 @@
<MenuItem Header="_File"> <MenuItem Header="_File">
<MenuItem Header="_Hello"> <MenuItem Header="_Hello">
<MenuItem Header="_Goodbye"/> <MenuItem Header="_Goodbye"/>
<Separator/>
<MenuItem Header="_World"/>
</MenuItem> </MenuItem>
<Separator Background="Red"/>
<MenuItem Header="_Test"/>
<Separator/>
<MenuItem Header="_World"/> <MenuItem Header="_World"/>
</MenuItem> </MenuItem>
</Menu> </Menu>

1
src/Perspex.Controls/Perspex.Controls.csproj

@ -45,6 +45,7 @@
<Compile Include="HotkeyManager.cs" /> <Compile Include="HotkeyManager.cs" />
<Compile Include="Platform\ITopLevelRenderer.cs" /> <Compile Include="Platform\ITopLevelRenderer.cs" />
<Compile Include="SelectionMode.cs" /> <Compile Include="SelectionMode.cs" />
<Compile Include="Separator.cs" />
<Compile Include="SystemDialog.cs" /> <Compile Include="SystemDialog.cs" />
<Compile Include="Generators\ITreeItemContainerGenerator.cs" /> <Compile Include="Generators\ITreeItemContainerGenerator.cs" />
<Compile Include="Generators\ItemContainers.cs" /> <Compile Include="Generators\ItemContainers.cs" />

19
src/Perspex.Controls/Separator.cs

@ -0,0 +1,19 @@
// Copyright (c) The Perspex Project. All rights reserved.
// Licensed under the MIT license. See licence.md file in the project root for full license information.
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Perspex.Controls.Primitives;
namespace Perspex.Controls
{
/// <summary>
/// A separator control.
/// </summary>
public class Separator : TemplatedControl
{
}
}

1
src/Perspex.Themes.Default/DefaultTheme.paml

@ -15,6 +15,7 @@
<StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.PopupRoot.paml"/> <StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.PopupRoot.paml"/>
<StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.ProgressBar.paml"/> <StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.ProgressBar.paml"/>
<StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.RadioButton.paml"/> <StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.RadioButton.paml"/>
<StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.Separator.paml"/>
<StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.ScrollBar.paml"/> <StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.ScrollBar.paml"/>
<StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.ScrollViewer.paml"/> <StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.ScrollViewer.paml"/>
<StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.TabControl.paml"/> <StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.TabControl.paml"/>

3
src/Perspex.Themes.Default/Perspex.Themes.Default.csproj

@ -180,6 +180,9 @@
<EmbeddedResource Include="DefaultTheme.paml"> <EmbeddedResource Include="DefaultTheme.paml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Separator.paml">
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

17
src/Perspex.Themes.Default/Separator.paml

@ -0,0 +1,17 @@
<Styles xmlns="https://github.com/perspex">
<Style Selector="Separator">
<Setter Property="Template">
<ControlTemplate>
<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}"/>
</ControlTemplate>
</Setter>
</Style>
<Style Selector="MenuItem > Separator">
<Setter Property="Background" Value="#ffd7d7d7"/>
<Setter Property="Margin" Value="29,1,0,1"/>
<Setter Property="Height" Value="1"/>
</Style>
</Styles>
Loading…
Cancel
Save