Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

HamburgerMenu changes #3324

Merged
merged 4 commits into from
Sep 13, 2018
Merged

HamburgerMenu changes #3324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
15f3403
Use Win10 slider style at HamburgerMenu samples
punker76 Sep 12, 2018
df2f19d
(GH-3284) Fix Gap between menu items and hamburger icon
punker76 Sep 12, 2018
998dd56
Rename `HamburgerMenuTemplate` to `HamburgerMenuButtonTemplate`
punker76 Sep 12, 2018
cd7e3e1
(GH-3239) Fix Customising HamburgerMenu
punker76 Sep 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuSample.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
</Trigger>
</Style.Triggers>
</Style>

<Style TargetType="{x:Type Slider}" BasedOn="{StaticResource MahApps.Metro.Styles.Slider.Win10}" />

<Style BasedOn="{StaticResource {x:Type Controls:MetroHeader}}" TargetType="{x:Type Controls:MetroHeader}">
<Setter Property="Controls:ControlsHelper.HeaderMargin" Value="0 0 0 5" />
Expand Down
28 changes: 21 additions & 7 deletions src/MahApps.Metro/Controls/HamburgerMenu/HamburgerMenu.HamburgerButton.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,31 @@ public partial class HamburgerMenu
public static readonly DependencyProperty HamburgerVisibilityProperty = DependencyProperty.Register(nameof(HamburgerVisibility), typeof(Visibility), typeof(HamburgerMenu), new PropertyMetadata(Visibility.Visible));

/// <summary>
/// Identifies the <see cref="HamburgerMenuTemplate"/> dependency property.
/// Identifies the <see cref="HamburgerButtonStyle"/> dependency property.
/// </summary>
public static readonly DependencyProperty HamburgerMenuTemplateProperty = DependencyProperty.Register(nameof(HamburgerMenuTemplate), typeof(DataTemplate), typeof(HamburgerMenu), new PropertyMetadata(null));
public static readonly DependencyProperty HamburgerButtonStyleProperty = DependencyProperty.Register(nameof(HamburgerButtonStyle), typeof(Style), typeof(HamburgerMenu), new PropertyMetadata(null));

/// <summary>
/// Gets or sets a template for the hamburger icon.
/// Identifies the <see cref="HamburgerButtonTemplate"/> dependency property.
/// </summary>
public DataTemplate HamburgerMenuTemplate
public static readonly DependencyProperty HamburgerButtonTemplateProperty = DependencyProperty.Register(nameof(HamburgerButtonTemplate), typeof(DataTemplate), typeof(HamburgerMenu), new PropertyMetadata(null));

/// <summary>
/// Gets or sets the Style used for the hamburger button.
/// </summary>
public Style HamburgerButtonStyle
{
get { return (Style)GetValue(HamburgerButtonStyleProperty); }
set { SetValue(HamburgerButtonStyleProperty, value); }
}

/// <summary>
/// Gets or sets a template for the hamburger button.
/// </summary>
public DataTemplate HamburgerButtonTemplate
{
get { return (DataTemplate)GetValue(HamburgerMenuTemplateProperty); }
set { SetValue(HamburgerMenuTemplateProperty, value); }
get { return (DataTemplate)GetValue(HamburgerButtonTemplateProperty); }
set { SetValue(HamburgerButtonTemplateProperty, value); }
}

/// <summary>
Expand All @@ -47,7 +61,7 @@ public DataTemplate HamburgerMenuTemplate
public static readonly DependencyProperty HamburgerMenuHeaderTemplateProperty = DependencyProperty.Register(nameof(HamburgerMenuHeaderTemplate), typeof(DataTemplate), typeof(HamburgerMenu), new PropertyMetadata(null));

/// <summary>
/// Gets or sets a template for the hamburger icon.
/// Gets or sets a template for the hamburger pane header.
/// </summary>
public DataTemplate HamburgerMenuHeaderTemplate
{
Expand Down
28 changes: 28 additions & 0 deletions src/MahApps.Metro/Controls/HamburgerMenu/HamburgerMenu.Properties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,16 @@ private static void CompactPaneLengthPropertyChangedCallback(DependencyObject de
}
}

/// <summary>
/// Identifies the <see cref="PaneMargin"/> dependency property.
/// </summary>
public static readonly DependencyProperty PaneMarginProperty = DependencyProperty.Register(nameof(PaneMargin), typeof(Thickness), typeof(HamburgerMenu), new PropertyMetadata(null));

/// <summary>
/// Identifies the <see cref="PaneHeaderMargin"/> dependency property.
/// </summary>
public static readonly DependencyProperty PaneHeaderMarginProperty = DependencyProperty.Register(nameof(PaneHeaderMargin), typeof(Thickness), typeof(HamburgerMenu), new PropertyMetadata(null));

/// <summary>
/// Identifies the <see cref="PaneBackground"/> dependency property.
/// </summary>
Expand Down Expand Up @@ -170,6 +180,24 @@ public double CompactPaneLength
set { SetValue(CompactPaneLengthProperty, value); }
}

/// <summary>
/// Gets or sets the margin for the pane.
/// </summary>
public Thickness PaneMargin
{
get { return (Thickness)GetValue(PaneMarginProperty); }
set { SetValue(PaneMarginProperty, value); }
}

/// <summary>
/// Gets or sets the margin for the pane header.
/// </summary>
public Thickness PaneHeaderMargin
{
get { return (Thickness)GetValue(PaneHeaderMarginProperty); }
set { SetValue(PaneHeaderMarginProperty, value); }
}

/// <summary>
/// Gets or sets the Brush to apply to the background of the Pane area of the control.
/// </summary>
Expand Down
7 changes: 5 additions & 2 deletions src/MahApps.Metro/Themes/HamburgerMenu.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
<Style x:Key="MahApps.Metro.Styles.HamburgerMenu" TargetType="{x:Type Controls:HamburgerMenu}">
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="Focusable" Value="False" />
<Setter Property="HamburgerMenuTemplate">
<Setter Property="HamburgerButtonStyle" Value="{DynamicResource HamburgerButtonStyle}" />
<Setter Property="HamburgerButtonTemplate">
<Setter.Value>
<DataTemplate>
<!-- PackIconMaterial - Menu -->
Expand All @@ -28,7 +29,9 @@
<Setter Property="OptionsItemContainerStyle" Value="{StaticResource HamburgerMenuItemStyle}" />
<Setter Property="PaneBackground" Value="{DynamicResource MahApps.Metro.HamburgerMenu.PaneBackgroundBrush}" />
<Setter Property="PaneForeground" Value="{DynamicResource MahApps.Metro.HamburgerMenu.PaneForegroundBrush}" />
<Setter Property="Template" Value="{StaticResource HamburgerMenuTemplate}" />
<Setter Property="PaneMargin" Value="0 0 0 8" />
<Setter Property="PaneHeaderMargin" Value="0 0 0 8" />
<Setter Property="Template" Value="{DynamicResource HamburgerMenuTemplate}" />
<Setter Property="VerticalContentAlignment" Value="Stretch" />
</Style>
</ResourceDictionary>
38 changes: 16 additions & 22 deletions src/MahApps.Metro/Themes/HamburgerMenuTemplate.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@
PaneForeground="{TemplateBinding PaneForeground}"
PanePlacement="{TemplateBinding PanePlacement}">
<Controls:SplitView.Pane>
<Grid x:Name="PaneGrid">
<Grid x:Name="PaneGrid" Margin="{TemplateBinding PaneMargin}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
Expand All @@ -335,11 +335,20 @@
<DockPanel x:Name="PaneHeader"
Grid.Row="0"
Height="{TemplateBinding HamburgerHeight}"
Margin="0 0 0 8"
Margin="{TemplateBinding PaneHeaderMargin}"
LastChildFill="True">
<Grid x:Name="PaneHeaderGap"
Width="{TemplateBinding HamburgerWidth}"
DockPanel.Dock="Left" />
<Button x:Name="HamburgerButton"
Width="{TemplateBinding HamburgerWidth}"
Height="{TemplateBinding HamburgerHeight}"
DockPanel.Dock="Left"
Padding="{TemplateBinding HamburgerMargin}"
AutomationProperties.Name="Main button"
ContentTemplate="{TemplateBinding HamburgerButtonTemplate}"
Foreground="{TemplateBinding PaneForeground}"
IsTabStop="{TemplateBinding IsTabStop}"
Style="{TemplateBinding HamburgerButtonStyle}"
TabIndex="0"
Visibility="{TemplateBinding HamburgerVisibility}" />
<ContentControl x:Name="PaneHeaderContent"
ContentTemplate="{TemplateBinding HamburgerMenuHeaderTemplate}"
IsTabStop="False" />
Expand All @@ -363,7 +372,7 @@
<ListBox Name="OptionsListView"
Grid.Row="2"
Width="{TemplateBinding OpenPaneLength}"
Margin="0 20 0 8"
Margin="0 20 0 0"
VerticalAlignment="Bottom"
AutomationProperties.Name="Option items"
Foreground="{TemplateBinding PaneForeground}"
Expand Down Expand Up @@ -392,25 +401,10 @@
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
Transition="{TemplateBinding ContentTransition}" />
</Controls:SplitView>
<Button x:Name="HamburgerButton"
Width="{TemplateBinding HamburgerWidth}"
Height="{TemplateBinding HamburgerHeight}"
Margin="0 0 0 8"
Padding="{TemplateBinding HamburgerMargin}"
HorizontalAlignment="Left"
VerticalAlignment="Top"
AutomationProperties.Name="Main button"
ContentTemplate="{TemplateBinding HamburgerMenuTemplate}"
Foreground="{TemplateBinding PaneForeground}"
IsTabStop="{TemplateBinding IsTabStop}"
Style="{StaticResource HamburgerButtonStyle}"
TabIndex="0"
Visibility="{TemplateBinding HamburgerVisibility}" />
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="PanePlacement" Value="Right">
<Setter TargetName="HamburgerButton" Property="HorizontalAlignment" Value="Right" />
<Setter TargetName="PaneHeaderGap" Property="DockPanel.Dock" Value="Right" />
<Setter TargetName="HamburgerButton" Property="DockPanel.Dock" Value="Right" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
Expand Down