tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Started implementing Menu control.

pull/58/head
Steven Kirk 11 years ago
parent
9652a6ee16
commit
919cae67ad
8 changed files with 274 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      Perspex.Controls/Menu.cs
  2. 29
      Perspex.Controls/MenuItem.cs
  3. 2
      Perspex.Controls/Perspex.Controls.csproj
  4. 4
      Perspex.Themes.Default/DefaultTheme.cs
  5. 119
      Perspex.Themes.Default/MenuItemStyle.cs
  6. 47
      Perspex.Themes.Default/MenuStyle.cs
  7. 2
      Perspex.Themes.Default/Perspex.Themes.Default.csproj
  8. 55
      TestApplication/Program.cs

19
Perspex.Controls/Menu.cs
View File

@ -0,0 +1,19 @@
// -----------------------------------------------------------------------
// <copyright file="Menu.cs" company="Steven Kirk">
// Copyright 2015 MIT Licence. See licence.md for more information.
// </copyright>
// -----------------------------------------------------------------------
namespace Perspex.Controls
{
public class Menu : ItemsControl
{
private static readonly ItemsPanelTemplate DefaultPanel =
new ItemsPanelTemplate(() => new StackPanel { Orientation = Orientation.Horizontal });
static Menu()
{
ItemsPanelProperty.OverrideDefaultValue(typeof(Menu), DefaultPanel);
}
}
}

29
Perspex.Controls/MenuItem.cs
View File

@ -0,0 +1,29 @@
// -----------------------------------------------------------------------
// <copyright file="MenuItem.cs" company="Steven Kirk">
// Copyright 2015 MIT Licence. See licence.md for more information.
// </copyright>
// -----------------------------------------------------------------------
namespace Perspex.Controls
{
using Perspex.Controls.Primitives;
using Perspex.Input;
public class MenuItem : HeaderedItemsControl
{
public static readonly PerspexProperty<bool> IsSubMenuOpenProperty =
PerspexProperty.Register<MenuItem, bool>("IsSubMenuOpen");
public bool IsSubMenuOpen
{
get { return this.GetValue(IsSubMenuOpenProperty); }
set { this.SetValue(IsSubMenuOpenProperty, value); }
}
protected override void OnPointerPressed(PointerPressEventArgs e)
{
base.OnPointerPressed(e);
this.IsSubMenuOpen = !this.IsSubMenuOpen;
}
}
}

2
Perspex.Controls/Perspex.Controls.csproj
View File

@ -37,6 +37,8 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="Border.cs" />
<Compile Include="MenuItem.cs" />
<Compile Include="Menu.cs" />
<Compile Include="Button.cs" />
<Compile Include="AdornerTemplate.cs" />
<Compile Include="DropDown.cs" />

4
Perspex.Themes.Default/DefaultTheme.cs
View File

@ -17,12 +17,14 @@ namespace Perspex.Themes.Default
this.Add(new ButtonStyle());
this.Add(new CheckBoxStyle());
this.Add(new ContentControlStyle());
this.Add(new DeckStyle());
this.Add(new DropDownStyle());
this.Add(new GridSplitterStyle());
this.Add(new ItemsControlStyle());
this.Add(new ListBoxStyle());
this.Add(new ListBoxItemStyle());
this.Add(new DeckStyle());
this.Add(new MenuStyle());
this.Add(new MenuItemStyle());
this.Add(new PopupRootStyle());
this.Add(new RadioButtonStyle());
this.Add(new ScrollBarStyle());

119
Perspex.Themes.Default/MenuItemStyle.cs
View File

@ -0,0 +1,119 @@
// -----------------------------------------------------------------------
// <copyright file="MenuItemStyle.cs" company="Steven Kirk">
// Copyright 2015 MIT Licence. See licence.md for more information.
// </copyright>
// -----------------------------------------------------------------------
namespace Perspex.Themes.Default
{
using Perspex.Controls;
using Perspex.Controls.Presenters;
using Perspex.Controls.Shapes;
using Perspex.Input;
using Perspex.Layout;
using Perspex.Media;
using Perspex.Styling;
using System.Linq;
public class MenuItemStyle : Styles
{
public MenuItemStyle()
{
this.AddRange(new[]
{
new Style(x => x.OfType<MenuItem>())
{
Setters = new[]
{
new Setter(MenuItem.BorderThicknessProperty, 1.0),
new Setter(MenuItem.PaddingProperty, new Thickness(6, 0)),
new Setter(MenuItem.TemplateProperty, ControlTemplate.Create<MenuItem>(this.Template)),
},
},
new Style(x => x.OfType<MenuItem>().Class(":pointerover").Template().Name("root"))
{
Setters = new[]
{
new Setter(Border.BackgroundProperty, new SolidColorBrush(0x3d26a0da)),
new Setter(Border.BorderBrushProperty, new SolidColorBrush(0xff26a0da)),
},
}
});
}
private Control Template(MenuItem control)
{
Popup popup;
var result = new Border
{
Name = "root",
[~Border.BackgroundProperty] = control[~MenuItem.BackgroundProperty],
[~Border.BorderBrushProperty] = control[~MenuItem.BorderBrushProperty],
[~Border.BorderThicknessProperty] = control[~MenuItem.BorderThicknessProperty],
Content = new Grid
{
ColumnDefinitions = new ColumnDefinitions
{
new ColumnDefinition(GridLength.Auto),
new ColumnDefinition(GridLength.Auto),
},
Children = new Controls
{
//new ContentPresenter
//{
// Name = "icon",
// [~ContentPresenter.ContentProperty] = control[~MenuItem.IconProperty],
// Width = 16,
// Height = 16,
// Margin = new Thickness(3),
// HorizontalAlignment = HorizontalAlignment.Center,
// VerticalAlignment = VerticalAlignment.Center,
//},
new Path
{
Data = StreamGeometry.Parse("F1M10,1.2L4.7,9.1 4.5,9.1 0,5.2 1.3,3.5 4.3,6.1 8.3,0 10,1.2z"),
Margin = new Thickness(3),
IsVisible = false,
VerticalAlignment = VerticalAlignment.Center,
[~Path.FillProperty] = control[~MenuItem.ForegroundProperty],
},
new ContentPresenter
{
[~ContentPresenter.ContentProperty] = control[~MenuItem.HeaderProperty],
[~ContentPresenter.MarginProperty] = control[~MenuItem.PaddingProperty],
[Grid.ColumnProperty] = 1,
},
(popup = new Popup
{
Name = "popup",
StaysOpen = false,
[!!Popup.IsOpenProperty] = control[!!MenuItem.IsSubMenuOpenProperty],
Child = new Border
{
Background = new SolidColorBrush(0xfff0f0f0),
BorderBrush = new SolidColorBrush(0xff999999),
BorderThickness = 1,
Padding = new Thickness(2),
Content = new ScrollViewer
{
Content = new ItemsPresenter
{
Name = "itemsPresenter",
[~ItemsPresenter.ItemsProperty] = control[~Menu.ItemsProperty],
[~ItemsPresenter.ItemsPanelProperty] = control[~Menu.ItemsPanelProperty],
[KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
}
}
}
})
},
}
};
popup.PlacementTarget = result;
return result;
}
}
}

47
Perspex.Themes.Default/MenuStyle.cs
View File

@ -0,0 +1,47 @@
// -----------------------------------------------------------------------
// <copyright file="MenuStyle.cs" company="Steven Kirk">
// Copyright 2015 MIT Licence. See licence.md for more information.
// </copyright>
// -----------------------------------------------------------------------
namespace Perspex.Themes.Default
{
using Perspex.Controls;
using Perspex.Controls.Presenters;
using Perspex.Styling;
using System.Linq;
public class MenuStyle : Styles
{
public MenuStyle()
{
this.AddRange(new[]
{
new Style(x => x.OfType<Menu>())
{
Setters = new[]
{
new Setter(Menu.TemplateProperty, ControlTemplate.Create<Menu>(this.Template)),
},
},
});
}
private Control Template(Menu control)
{
return new Border
{
[~Border.BackgroundProperty] = control[~Menu.BackgroundProperty],
[~Border.BorderBrushProperty] = control[~Menu.BorderBrushProperty],
[~Border.BorderThicknessProperty] = control[~Menu.BorderThicknessProperty],
[~Border.PaddingProperty] = control[~Menu.PaddingProperty],
Content = new ItemsPresenter
{
Name = "itemsPresenter",
[~ItemsPresenter.ItemsProperty] = control[~Menu.ItemsProperty],
[~ItemsPresenter.ItemsPanelProperty] = control[~Menu.ItemsPanelProperty],
}
};
}
}
}

2
Perspex.Themes.Default/Perspex.Themes.Default.csproj
View File

@ -71,6 +71,8 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="MenuItemStyle.cs" />
<Compile Include="MenuStyle.cs" />
<Compile Include="ToolTipStyle.cs" />
<Compile Include="FocusAdornerStyle.cs" />
<Compile Include="DropDownStyle.cs" />

55
TestApplication/Program.cs
View File

@ -129,11 +129,61 @@ namespace TestApplication
},
RowDefinitions = new RowDefinitions
{
new RowDefinition(GridLength.Auto),
new RowDefinition(1, GridUnitType.Star),
new RowDefinition(GridLength.Auto),
},
Children = new Controls
{
new Menu
{
Items = new[]
{
new MenuItem
{
Header = "_File",
Items = new[]
{
new MenuItem
{
Header = "_Open...",
},
new MenuItem
{
Header = "_Save",
},
new MenuItem
{
Header = "Save _As",
},
new MenuItem
{
Header = "E_xit",
},
}
},
new MenuItem
{
Header = "_Edit",
Items = new[]
{
new MenuItem
{
Header = "Cu_t",
},
new MenuItem
{
Header = "_Copy",
},
new MenuItem
{
Header = "_Paste",
},
}
}
},
[Grid.ColumnSpanProperty] = 2,
},
new TabControl
{
Items = new[]
@ -146,13 +196,14 @@ namespace TestApplication
AnimationsTab(),
},
Transition = new PageSlide(TimeSpan.FromSeconds(0.25)),
[Grid.RowProperty] = 1,
[Grid.ColumnSpanProperty] = 2,
},
(fps = new TextBlock
{
HorizontalAlignment = HorizontalAlignment.Left,
Margin = new Thickness(2),
[Grid.RowProperty] = 1,
[Grid.RowProperty] = 2,
}),
new TextBlock
{
@ -160,7 +211,7 @@ namespace TestApplication
HorizontalAlignment = HorizontalAlignment.Right,
Margin = new Thickness(2),
[Grid.ColumnProperty] = 1,
[Grid.RowProperty] = 1,
[Grid.RowProperty] = 2,
},
}
},

Write Preview
Loading…
Cancel
Save