Skip to content
This repository was archived by the owner on Feb 25, 2026. It is now read-only.

1.5.1 #1323

Merged
nmetulev merged 21 commits into from
Jul 17, 2017
Merged

1.5.1 #1323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c655484
changed MenuItem Header to type object
nmetulev Jul 5, 2017
f6ec0f2
DropShadowPanel Content wireup size changed
hermitdave Jul 11, 2017
a4e0e16
Override OnContentChanged for DropShadowPanel and wire unwire into co…
hermitdave Jul 12, 2017
724441f
Adding headerTemplate
IbraheemOsama Jul 12, 2017
9432936
Update bind file
IbraheemOsama Jul 12, 2017
8ec2097
updating item documentation
IbraheemOsama Jul 12, 2017
a680e0b
TextBoxMasks in TextBoxMask
Jul 12, 2017
74aa3b0
Merge pull request #1312 from ArtisanDuCode/dev
nmetulev Jul 12, 2017
99ae9e6
Fixed type of a default value of HamburgerMenu.OpenPanelLength
snrnats Jul 12, 2017
0318d18
Merge pull request #1294 from Microsoft/menuitemheader
nmetulev Jul 12, 2017
79da13f
Merge pull request #1314 from snrnats/dev
IbraheemOsama Jul 13, 2017
4cdefee
Merge pull request #1307 from Microsoft/Dropshadow-Content
IbraheemOsama Jul 13, 2017
734fba0
reverting back hamburgermenuitem
nmetulev Jul 14, 2017
c711809
changed type
nmetulev Jul 14, 2017
e73d933
prety code
nmetulev Jul 14, 2017
ad9afc8
margin
nmetulev Jul 14, 2017
f34dc52
prety code
nmetulev Jul 14, 2017
21bdfac
Update appveyor.yml
nmetulev Jul 14, 2017
8b13625
Merge pull request #1317 from Microsoft/revertinghamburgermenu
nmetulev Jul 14, 2017
ebe04a1
updated font sizes
nmetulev Jul 14, 2017
e06998e
Merge pull request #1318 from Microsoft/1.5.1
nmetulev Jul 14, 2017
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
54 changes: 46 additions & 8 deletions Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HamburgerMenu/HamburgerMenuCode.bind
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,47 @@
xmlns:data="using:Microsoft.Toolkit.Uwp.SampleApp.Data"
mc:Ignorable="d">

<Page.Resources>
<DataTemplate x:Key="HamburgerMenuItem" x:DataType="controls:HamburgerMenuGlyphItem">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="48" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<FontIcon Grid.Column="0"
FontSize="16"
FontFamily="Segoe MDL2 Assets"
Glyph="{Binding Glyph}"
Foreground="White" />
<TextBlock Grid.Column="1"
Text="{x:Bind Label}"
Foreground="White"
FontSize="16"
VerticalAlignment="Center" />
</Grid>
</DataTemplate>

<DataTemplate x:Key="HamburgerMenuImageItem" x:DataType="controls:HamburgerMenuImageItem">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="48" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Image Source="{Binding Thumbnail}" Stretch="UniformToFill" Margin="16,12" />
<TextBlock Grid.Column="1"
Text="{x:Bind Label}"
Foreground="White"
FontSize="16"
VerticalAlignment="Center" />
</Grid>
</DataTemplate>
</Page.Resources>

<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Margin="50" BorderThickness="1" BorderBrush="Black">
<controls:HamburgerMenu PaneBackground="@[PaneBackground:Brush:Black]" x:Name="HamburgerMenu"
Foreground="White"
ItemTemplate="{StaticResource HamburgerMenuImageItem}"
OptionsItemTemplate="{StaticResource HamburgerMenuItem}"
ItemClick="HamburgerMenu_OnItemClick"
OptionsItemClick="HamburgerMenu_OnOptionsItemClick"
OpenPaneLength="@[OpenPaneLength:Slider:240:50-400]"
Expand All @@ -22,14 +60,14 @@
<!-- Items -->
<controls:HamburgerMenu.ItemsSource>
<controls:HamburgerMenuItemCollection>
<controls:HamburgerMenuImageItem Thumbnail="ms-appx:///Assets/Photos/BigFourSummerHeat.jpg"
Label="Big four summer heat" />
<controls:HamburgerMenuImageItem Thumbnail="ms-appx:///Assets/Photos/BisonBadlandsChillin.jpg"
Label="Bison badlands Chillin" />
<controls:HamburgerMenuImageItem Thumbnail="ms-appx:///Assets/Photos/GiantSlabInOregon.jpg"
Label="Giant slab in Oregon" />
<controls:HamburgerMenuImageItem Thumbnail="ms-appx:///Assets/Photos/LakeAnnMushroom.jpg"
Label="Lake Ann Mushroom" />
<controls:HamburgerMenuImageItem Label="Big four summer heat"
Thumbnail="/Assets/Photos/BigFourSummerHeat.jpg"/>
<controls:HamburgerMenuImageItem Label="Bison badlands Chillin"
Thumbnail="/Assets/Photos/BisonBadlandsChillin.jpg"/>
<controls:HamburgerMenuImageItem Label="Giant slab in Oregon"
Thumbnail="/Assets/Photos/GiantSlabInOregon.jpg"/>
<controls:HamburgerMenuImageItem Label="Lake Ann Mushroom"
Thumbnail="/Assets/Photos/LakeAnnMushroom.jpg"/>
</controls:HamburgerMenuItemCollection>
</controls:HamburgerMenu.ItemsSource>

Expand Down
59 changes: 51 additions & 8 deletions Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HamburgerMenu/HamburgerMenuPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,47 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">

<Page.Resources>
<DataTemplate x:Key="HamburgerMenuItem"
x:DataType="controls:HamburgerMenuGlyphItem">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="48" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<FontIcon Grid.Column="0"
FontFamily="Segoe MDL2 Assets"
FontSize="16"
Foreground="White"
Glyph="{Binding Glyph}" />
<TextBlock Grid.Column="1"
VerticalAlignment="Center"
FontSize="16"
Foreground="White"
Text="{x:Bind Label}" />
</Grid>
</DataTemplate>

<DataTemplate x:Key="HamburgerMenuImageItem"
x:DataType="controls:HamburgerMenuImageItem">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="48" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Image Margin="16,12"
Source="{Binding Thumbnail}"
Stretch="UniformToFill" />
<TextBlock Grid.Column="1"
VerticalAlignment="Center"
FontSize="16"
Foreground="White"
Text="{x:Bind Label}" />
</Grid>
</DataTemplate>
</Page.Resources>

<Grid Padding="50"
Background="{StaticResource Brush-Grey-05}">
<controls:HamburgerMenu x:Name="HamburgerMenuControl"
Expand All @@ -16,20 +57,22 @@
HamburgerWidth="48"
IsPaneOpen="{Binding IsPaneOpen.Value, Mode=TwoWay}"
ItemClick="HamburgerMenu_OnItemClick"
ItemTemplate="{StaticResource HamburgerMenuImageItem}"
OpenPaneLength="{Binding OpenPaneLength.Value}"
OptionsItemClick="HamburgerMenu_OnOptionsItemClick"
OptionsItemTemplate="{StaticResource HamburgerMenuItem}"
PaneBackground="{Binding PaneBackground.Value}">
<!-- Items -->
<controls:HamburgerMenu.ItemsSource>
<controls:HamburgerMenuItemCollection>
<controls:HamburgerMenuImageItem Thumbnail="ms-appx:///Assets/Photos/BigFourSummerHeat.jpg"
Label="Big four summer heat" />
<controls:HamburgerMenuImageItem Thumbnail="ms-appx:///Assets/Photos/BisonBadlandsChillin.jpg"
Label="Bison badlands Chillin" />
<controls:HamburgerMenuImageItem Thumbnail="ms-appx:///Assets/Photos/GiantSlabInOregon.jpg"
Label="Giant slab in Oregon" />
<controls:HamburgerMenuImageItem Thumbnail="ms-appx:///Assets/Photos/LakeAnnMushroom.jpg"
Label="Lake Ann Mushroom" />
<controls:HamburgerMenuImageItem Label="Big four summer heat"
Thumbnail="ms-appx:///Assets/Photos/BigFourSummerHeat.jpg" />
<controls:HamburgerMenuImageItem Label="Bison badlands Chillin"
Thumbnail="ms-appx:///Assets/Photos/BisonBadlandsChillin.jpg" />
<controls:HamburgerMenuImageItem Label="Giant slab in Oregon"
Thumbnail="ms-appx:///Assets/Photos/GiantSlabInOregon.jpg" />
<controls:HamburgerMenuImageItem Label="Lake Ann Mushroom"
Thumbnail="ms-appx:///Assets/Photos/LakeAnnMushroom.jpg" />
</controls:HamburgerMenuItemCollection>
</controls:HamburgerMenu.ItemsSource>

Expand Down
9 changes: 7 additions & 2 deletions Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Menu/Menu.bind
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,13 @@
Orientation="@[Orientation:Enum:Orientation.Horizontal]"
TooltipPlacement="@[TooltipPlacement:Enum:PlacementMode.Bottom]">

<controls:MenuItem controls:Menu.InputGestureText="Alt+F"
Header="File">
<controls:MenuItem controls:Menu.InputGestureText="Alt+F">
<controls:MenuItem.Header>
<StackPanel Orientation="Horizontal">
<SymbolIcon Symbol="Document" />
<TextBlock Text="File" Margin="5,0,0,0" />
</StackPanel>
</controls:MenuItem.Header>
<MenuFlyoutSubItem Text="New">
<MenuFlyoutItem controls:Menu.InputGestureText="Ctrl+Shift+N"
Command="{StaticResource NewProject}"
Expand Down
146 changes: 8 additions & 138 deletions Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Menu/MenuPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,14 @@
TooltipPlacement="{Binding TooltipPlacement.Value, Mode=TwoWay}">

<controls:MenuItem Name="FileMenu"
controls:Menu.InputGestureText="Alt+F"
Header="File">
controls:Menu.InputGestureText="Alt+F">
<controls:MenuItem.Header>
<StackPanel Orientation="Horizontal">
<SymbolIcon Symbol="Document" />
<TextBlock Text="File" Margin="5,0,0,0" />
</StackPanel>
</controls:MenuItem.Header>

<MenuFlyoutSubItem Text="New">
<MenuFlyoutItem controls:Menu.InputGestureText="Ctrl+Shift+N"
Command="{StaticResource NewProject}"
Expand Down Expand Up @@ -121,142 +127,6 @@
<MenuFlyoutItem Text="Grid" />
</MenuFlyoutSubItem>
</controls:MenuItem>

<controls:MenuItem Header="Debug">
<MenuFlyoutSubItem Text="Windows">
<MenuFlyoutItem Text="Windows 8" />
<MenuFlyoutItem Text="Windows 10" />
</MenuFlyoutSubItem>

<MenuFlyoutSubItem Text="Graphics">
<MenuFlyoutItem Text="Canvas" />
<MenuFlyoutItem Text="Grid" />
</MenuFlyoutSubItem>
</controls:MenuItem>

<controls:MenuItem Header="Debug">
<MenuFlyoutSubItem Text="Windows">
<MenuFlyoutItem Text="Windows 8" />
<MenuFlyoutItem Text="Windows 10" />
</MenuFlyoutSubItem>

<MenuFlyoutSubItem Text="Graphics">
<MenuFlyoutItem Text="Canvas" />
<MenuFlyoutItem Text="Grid" />
</MenuFlyoutSubItem>
</controls:MenuItem>

<controls:MenuItem Header="Debug">
<MenuFlyoutSubItem Text="Windows">
<MenuFlyoutItem Text="Windows 8" />
<MenuFlyoutItem Text="Windows 10" />
</MenuFlyoutSubItem>

<MenuFlyoutSubItem Text="Graphics">
<MenuFlyoutItem Text="Canvas" />
<MenuFlyoutItem Text="Grid" />
</MenuFlyoutSubItem>
</controls:MenuItem>

<controls:MenuItem Header="Debug">
<MenuFlyoutSubItem Text="Windows">
<MenuFlyoutItem Text="Windows 8" />
<MenuFlyoutItem Text="Windows 10" />
</MenuFlyoutSubItem>

<MenuFlyoutSubItem Text="Graphics">
<MenuFlyoutItem Text="Canvas" />
<MenuFlyoutItem Text="Grid" />
</MenuFlyoutSubItem>
</controls:MenuItem>

<controls:MenuItem Header="Debug">
<MenuFlyoutSubItem Text="Windows">
<MenuFlyoutItem Text="Windows 8" />
<MenuFlyoutItem Text="Windows 10" />
</MenuFlyoutSubItem>

<MenuFlyoutSubItem Text="Graphics">
<MenuFlyoutItem Text="Canvas" />
<MenuFlyoutItem Text="Grid" />
</MenuFlyoutSubItem>
</controls:MenuItem>

<controls:MenuItem Header="Debug">
<MenuFlyoutSubItem Text="Windows">
<MenuFlyoutItem Text="Windows 8" />
<MenuFlyoutItem Text="Windows 10" />
</MenuFlyoutSubItem>

<MenuFlyoutSubItem Text="Graphics">
<MenuFlyoutItem Text="Canvas" />
<MenuFlyoutItem Text="Grid" />
</MenuFlyoutSubItem>
</controls:MenuItem>

<controls:MenuItem Header="Debug">
<MenuFlyoutSubItem Text="Windows">
<MenuFlyoutItem Text="Windows 8" />
<MenuFlyoutItem Text="Windows 10" />
</MenuFlyoutSubItem>

<MenuFlyoutSubItem Text="Graphics">
<MenuFlyoutItem Text="Canvas" />
<MenuFlyoutItem Text="Grid" />
</MenuFlyoutSubItem>
</controls:MenuItem>

<controls:MenuItem Header="Debug">
<MenuFlyoutSubItem Text="Windows">
<MenuFlyoutItem Text="Windows 8" />
<MenuFlyoutItem Text="Windows 10" />
</MenuFlyoutSubItem>

<MenuFlyoutSubItem Text="Graphics">
<MenuFlyoutItem Text="Canvas" />
<MenuFlyoutItem Text="Grid" />
</MenuFlyoutSubItem>
</controls:MenuItem>
<controls:MenuItem Header="Debug">
<MenuFlyoutSubItem Text="Windows">
<MenuFlyoutItem Text="Windows 8" />
<MenuFlyoutItem Text="Windows 10" />
</MenuFlyoutSubItem>

<MenuFlyoutSubItem Text="Graphics">
<MenuFlyoutItem Text="Canvas" />
<MenuFlyoutItem Text="Grid" />
</MenuFlyoutSubItem>
</controls:MenuItem>

<controls:MenuItem Header="Debug">
<MenuFlyoutSubItem Text="Windows">
<MenuFlyoutItem Text="Windows 8" />
<MenuFlyoutItem Text="Windows 10" />
</MenuFlyoutSubItem>

<MenuFlyoutSubItem Text="Graphics">
<MenuFlyoutItem Text="Canvas" />
<MenuFlyoutItem Text="Grid" />
</MenuFlyoutSubItem>
</controls:MenuItem>

<controls:MenuItem Header="Debug">
<MenuFlyoutSubItem Text="Windows">
<MenuFlyoutItem Text="Windows 8" />
<MenuFlyoutItem Text="Windows 10" />
</MenuFlyoutSubItem>

<MenuFlyoutSubItem Text="Graphics">
<MenuFlyoutItem Text="Canvas" />
<MenuFlyoutItem Text="Grid" />
</MenuFlyoutSubItem>
</controls:MenuItem>

<controls:MenuItem Header="Debug">

</controls:MenuItem>

</controls:Menu>

<StackPanel Grid.Row="1">
Expand Down
32 changes: 30 additions & 2 deletions Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,40 @@
<Page.Resources>
<DataTemplate x:Key="ButtonTemplate"
x:DataType="local:SampleCategory">
<controls:HamburgerMenuImageItem Thumbnail="{x:Bind Icon}" Label="{x:Bind Name}"/>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="48" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Image Margin="16,12"
Source="{x:Bind Icon}"
Stretch="Uniform" />
<TextBlock Grid.Column="1"
VerticalAlignment="Center"
FontSize="16"
Foreground="White"
Text="{x:Bind Name}" />
</Grid>
</DataTemplate>

<DataTemplate x:Key="OptionTemplate"
x:DataType="local:Option">
<controls:HamburgerMenuGlyphItem Glyph="{x:Bind Glyph}" Label="{x:Bind Name}"/>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="48" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<FontIcon Grid.Column="0"
FontFamily="Segoe MDL2 Assets"
FontSize="16"
Foreground="White"
Glyph="{x:Bind Glyph}" />
<TextBlock Grid.Column="1"
VerticalAlignment="Center"
FontSize="16"
Foreground="White"
Text="{x:Bind Name}" />
</Grid>
</DataTemplate>

</Page.Resources>
Expand Down
Loading