Skip to content

Commit ae3a3d9

Browse files
nmetulevnmetulev
authored
Merge pull request #1323 from Microsoft/dev
1.5.1
2 parents 367cd72 + e06998e commit ae3a3d9

File tree

15 files changed

+222
-244
lines changed

15 files changed

+222
-244
lines changed

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HamburgerMenu/HamburgerMenuCode.bind‎

Lines changed: 46 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,47 @@
88
xmlns:data="using:Microsoft.Toolkit.Uwp.SampleApp.Data"
99
mc:Ignorable="d">
1010

11+
<Page.Resources>
12+
<DataTemplate x:Key="HamburgerMenuItem" x:DataType="controls:HamburgerMenuGlyphItem">
13+
<Grid>
14+
<Grid.ColumnDefinitions>
15+
<ColumnDefinition Width="48" />
16+
<ColumnDefinition />
17+
</Grid.ColumnDefinitions>
18+
<FontIcon Grid.Column="0"
19+
FontSize="16"
20+
FontFamily="Segoe MDL2 Assets"
21+
Glyph="{Binding Glyph}"
22+
Foreground="White" />
23+
<TextBlock Grid.Column="1"
24+
Text="{x:Bind Label}"
25+
Foreground="White"
26+
FontSize="16"
27+
VerticalAlignment="Center" />
28+
</Grid>
29+
</DataTemplate>
30+
31+
<DataTemplate x:Key="HamburgerMenuImageItem" x:DataType="controls:HamburgerMenuImageItem">
32+
<Grid>
33+
<Grid.ColumnDefinitions>
34+
<ColumnDefinition Width="48" />
35+
<ColumnDefinition />
36+
</Grid.ColumnDefinitions>
37+
<Image Source="{Binding Thumbnail}" Stretch="UniformToFill" Margin="16,12" />
38+
<TextBlock Grid.Column="1"
39+
Text="{x:Bind Label}"
40+
Foreground="White"
41+
FontSize="16"
42+
VerticalAlignment="Center" />
43+
</Grid>
44+
</DataTemplate>
45+
</Page.Resources>
46+
1147
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Margin="50" BorderThickness="1" BorderBrush="Black">
1248
<controls:HamburgerMenu PaneBackground="@[PaneBackground:Brush:Black]" x:Name="HamburgerMenu"
1349
Foreground="White"
50+
ItemTemplate="{StaticResource HamburgerMenuImageItem}"
51+
OptionsItemTemplate="{StaticResource HamburgerMenuItem}"
1452
ItemClick="HamburgerMenu_OnItemClick"
1553
OptionsItemClick="HamburgerMenu_OnOptionsItemClick"
1654
OpenPaneLength="@[OpenPaneLength:Slider:240:50-400]"
@@ -22,14 +60,14 @@
2260
<!-- Items -->
2361
<controls:HamburgerMenu.ItemsSource>
2462
<controls:HamburgerMenuItemCollection>
25-
<controls:HamburgerMenuImageItem Thumbnail="ms-appx:///Assets/Photos/BigFourSummerHeat.jpg"
26-
Label="Big four summer heat" />
27-
<controls:HamburgerMenuImageItem Thumbnail="ms-appx:///Assets/Photos/BisonBadlandsChillin.jpg"
28-
Label="Bison badlands Chillin" />
29-
<controls:HamburgerMenuImageItem Thumbnail="ms-appx:///Assets/Photos/GiantSlabInOregon.jpg"
30-
Label="Giant slab in Oregon" />
31-
<controls:HamburgerMenuImageItem Thumbnail="ms-appx:///Assets/Photos/LakeAnnMushroom.jpg"
32-
Label="Lake Ann Mushroom" />
63+
<controls:HamburgerMenuImageItem Label="Big four summer heat"
64+
Thumbnail="/Assets/Photos/BigFourSummerHeat.jpg"/>
65+
<controls:HamburgerMenuImageItem Label="Bison badlands Chillin"
66+
Thumbnail="/Assets/Photos/BisonBadlandsChillin.jpg"/>
67+
<controls:HamburgerMenuImageItem Label="Giant slab in Oregon"
68+
Thumbnail="/Assets/Photos/GiantSlabInOregon.jpg"/>
69+
<controls:HamburgerMenuImageItem Label="Lake Ann Mushroom"
70+
Thumbnail="/Assets/Photos/LakeAnnMushroom.jpg"/>
3371
</controls:HamburgerMenuItemCollection>
3472
</controls:HamburgerMenu.ItemsSource>
3573

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HamburgerMenu/HamburgerMenuPage.xaml‎

Lines changed: 51 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,47 @@
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
77
mc:Ignorable="d">
8+
9+
<Page.Resources>
10+
<DataTemplate x:Key="HamburgerMenuItem"
11+
x:DataType="controls:HamburgerMenuGlyphItem">
12+
<Grid>
13+
<Grid.ColumnDefinitions>
14+
<ColumnDefinition Width="48" />
15+
<ColumnDefinition />
16+
</Grid.ColumnDefinitions>
17+
<FontIcon Grid.Column="0"
18+
FontFamily="Segoe MDL2 Assets"
19+
FontSize="16"
20+
Foreground="White"
21+
Glyph="{Binding Glyph}" />
22+
<TextBlock Grid.Column="1"
23+
VerticalAlignment="Center"
24+
FontSize="16"
25+
Foreground="White"
26+
Text="{x:Bind Label}" />
27+
</Grid>
28+
</DataTemplate>
29+
30+
<DataTemplate x:Key="HamburgerMenuImageItem"
31+
x:DataType="controls:HamburgerMenuImageItem">
32+
<Grid>
33+
<Grid.ColumnDefinitions>
34+
<ColumnDefinition Width="48" />
35+
<ColumnDefinition />
36+
</Grid.ColumnDefinitions>
37+
<Image Margin="16,12"
38+
Source="{Binding Thumbnail}"
39+
Stretch="UniformToFill" />
40+
<TextBlock Grid.Column="1"
41+
VerticalAlignment="Center"
42+
FontSize="16"
43+
Foreground="White"
44+
Text="{x:Bind Label}" />
45+
</Grid>
46+
</DataTemplate>
47+
</Page.Resources>
48+
849
<Grid Padding="50"
950
Background="{StaticResource Brush-Grey-05}">
1051
<controls:HamburgerMenu x:Name="HamburgerMenuControl"
@@ -16,20 +57,22 @@
1657
HamburgerWidth="48"
1758
IsPaneOpen="{Binding IsPaneOpen.Value, Mode=TwoWay}"
1859
ItemClick="HamburgerMenu_OnItemClick"
60+
ItemTemplate="{StaticResource HamburgerMenuImageItem}"
1961
OpenPaneLength="{Binding OpenPaneLength.Value}"
2062
OptionsItemClick="HamburgerMenu_OnOptionsItemClick"
63+
OptionsItemTemplate="{StaticResource HamburgerMenuItem}"
2164
PaneBackground="{Binding PaneBackground.Value}">
2265
<!-- Items -->
2366
<controls:HamburgerMenu.ItemsSource>
2467
<controls:HamburgerMenuItemCollection>
25-
<controls:HamburgerMenuImageItem Thumbnail="ms-appx:///Assets/Photos/BigFourSummerHeat.jpg"
26-
Label="Big four summer heat" />
27-
<controls:HamburgerMenuImageItem Thumbnail="ms-appx:///Assets/Photos/BisonBadlandsChillin.jpg"
28-
Label="Bison badlands Chillin" />
29-
<controls:HamburgerMenuImageItem Thumbnail="ms-appx:///Assets/Photos/GiantSlabInOregon.jpg"
30-
Label="Giant slab in Oregon" />
31-
<controls:HamburgerMenuImageItem Thumbnail="ms-appx:///Assets/Photos/LakeAnnMushroom.jpg"
32-
Label="Lake Ann Mushroom" />
68+
<controls:HamburgerMenuImageItem Label="Big four summer heat"
69+
Thumbnail="ms-appx:///Assets/Photos/BigFourSummerHeat.jpg" />
70+
<controls:HamburgerMenuImageItem Label="Bison badlands Chillin"
71+
Thumbnail="ms-appx:///Assets/Photos/BisonBadlandsChillin.jpg" />
72+
<controls:HamburgerMenuImageItem Label="Giant slab in Oregon"
73+
Thumbnail="ms-appx:///Assets/Photos/GiantSlabInOregon.jpg" />
74+
<controls:HamburgerMenuImageItem Label="Lake Ann Mushroom"
75+
Thumbnail="ms-appx:///Assets/Photos/LakeAnnMushroom.jpg" />
3376
</controls:HamburgerMenuItemCollection>
3477
</controls:HamburgerMenu.ItemsSource>
3578

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Menu/Menu.bind‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,13 @@
2727
Orientation="@[Orientation:Enum:Orientation.Horizontal]"
2828
TooltipPlacement="@[TooltipPlacement:Enum:PlacementMode.Bottom]">
2929

30-
<controls:MenuItem controls:Menu.InputGestureText="Alt+F"
31-
Header="File">
30+
<controls:MenuItem controls:Menu.InputGestureText="Alt+F">
31+
<controls:MenuItem.Header>
32+
<StackPanel Orientation="Horizontal">
33+
<SymbolIcon Symbol="Document" />
34+
<TextBlock Text="File" Margin="5,0,0,0" />
35+
</StackPanel>
36+
</controls:MenuItem.Header>
3237
<MenuFlyoutSubItem Text="New">
3338
<MenuFlyoutItem controls:Menu.InputGestureText="Ctrl+Shift+N"
3439
Command="{StaticResource NewProject}"

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Menu/MenuPage.xaml‎

Lines changed: 8 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,14 @@
2626
TooltipPlacement="{Binding TooltipPlacement.Value, Mode=TwoWay}">
2727

2828
<controls:MenuItem Name="FileMenu"
29-
controls:Menu.InputGestureText="Alt+F"
30-
Header="File">
29+
controls:Menu.InputGestureText="Alt+F">
30+
<controls:MenuItem.Header>
31+
<StackPanel Orientation="Horizontal">
32+
<SymbolIcon Symbol="Document" />
33+
<TextBlock Text="File" Margin="5,0,0,0" />
34+
</StackPanel>
35+
</controls:MenuItem.Header>
36+
3137
<MenuFlyoutSubItem Text="New">
3238
<MenuFlyoutItem controls:Menu.InputGestureText="Ctrl+Shift+N"
3339
Command="{StaticResource NewProject}"
@@ -121,142 +127,6 @@
121127
<MenuFlyoutItem Text="Grid" />
122128
</MenuFlyoutSubItem>
123129
</controls:MenuItem>
124-
125-
<controls:MenuItem Header="Debug">
126-
<MenuFlyoutSubItem Text="Windows">
127-
<MenuFlyoutItem Text="Windows 8" />
128-
<MenuFlyoutItem Text="Windows 10" />
129-
</MenuFlyoutSubItem>
130-
131-
<MenuFlyoutSubItem Text="Graphics">
132-
<MenuFlyoutItem Text="Canvas" />
133-
<MenuFlyoutItem Text="Grid" />
134-
</MenuFlyoutSubItem>
135-
</controls:MenuItem>
136-
137-
<controls:MenuItem Header="Debug">
138-
<MenuFlyoutSubItem Text="Windows">
139-
<MenuFlyoutItem Text="Windows 8" />
140-
<MenuFlyoutItem Text="Windows 10" />
141-
</MenuFlyoutSubItem>
142-
143-
<MenuFlyoutSubItem Text="Graphics">
144-
<MenuFlyoutItem Text="Canvas" />
145-
<MenuFlyoutItem Text="Grid" />
146-
</MenuFlyoutSubItem>
147-
</controls:MenuItem>
148-
149-
<controls:MenuItem Header="Debug">
150-
<MenuFlyoutSubItem Text="Windows">
151-
<MenuFlyoutItem Text="Windows 8" />
152-
<MenuFlyoutItem Text="Windows 10" />
153-
</MenuFlyoutSubItem>
154-
155-
<MenuFlyoutSubItem Text="Graphics">
156-
<MenuFlyoutItem Text="Canvas" />
157-
<MenuFlyoutItem Text="Grid" />
158-
</MenuFlyoutSubItem>
159-
</controls:MenuItem>
160-
161-
<controls:MenuItem Header="Debug">
162-
<MenuFlyoutSubItem Text="Windows">
163-
<MenuFlyoutItem Text="Windows 8" />
164-
<MenuFlyoutItem Text="Windows 10" />
165-
</MenuFlyoutSubItem>
166-
167-
<MenuFlyoutSubItem Text="Graphics">
168-
<MenuFlyoutItem Text="Canvas" />
169-
<MenuFlyoutItem Text="Grid" />
170-
</MenuFlyoutSubItem>
171-
</controls:MenuItem>
172-
173-
<controls:MenuItem Header="Debug">
174-
<MenuFlyoutSubItem Text="Windows">
175-
<MenuFlyoutItem Text="Windows 8" />
176-
<MenuFlyoutItem Text="Windows 10" />
177-
</MenuFlyoutSubItem>
178-
179-
<MenuFlyoutSubItem Text="Graphics">
180-
<MenuFlyoutItem Text="Canvas" />
181-
<MenuFlyoutItem Text="Grid" />
182-
</MenuFlyoutSubItem>
183-
</controls:MenuItem>
184-
185-
<controls:MenuItem Header="Debug">
186-
<MenuFlyoutSubItem Text="Windows">
187-
<MenuFlyoutItem Text="Windows 8" />
188-
<MenuFlyoutItem Text="Windows 10" />
189-
</MenuFlyoutSubItem>
190-
191-
<MenuFlyoutSubItem Text="Graphics">
192-
<MenuFlyoutItem Text="Canvas" />
193-
<MenuFlyoutItem Text="Grid" />
194-
</MenuFlyoutSubItem>
195-
</controls:MenuItem>
196-
197-
<controls:MenuItem Header="Debug">
198-
<MenuFlyoutSubItem Text="Windows">
199-
<MenuFlyoutItem Text="Windows 8" />
200-
<MenuFlyoutItem Text="Windows 10" />
201-
</MenuFlyoutSubItem>
202-
203-
<MenuFlyoutSubItem Text="Graphics">
204-
<MenuFlyoutItem Text="Canvas" />
205-
<MenuFlyoutItem Text="Grid" />
206-
</MenuFlyoutSubItem>
207-
</controls:MenuItem>
208-
209-
<controls:MenuItem Header="Debug">
210-
<MenuFlyoutSubItem Text="Windows">
211-
<MenuFlyoutItem Text="Windows 8" />
212-
<MenuFlyoutItem Text="Windows 10" />
213-
</MenuFlyoutSubItem>
214-
215-
<MenuFlyoutSubItem Text="Graphics">
216-
<MenuFlyoutItem Text="Canvas" />
217-
<MenuFlyoutItem Text="Grid" />
218-
</MenuFlyoutSubItem>
219-
</controls:MenuItem>
220-
<controls:MenuItem Header="Debug">
221-
<MenuFlyoutSubItem Text="Windows">
222-
<MenuFlyoutItem Text="Windows 8" />
223-
<MenuFlyoutItem Text="Windows 10" />
224-
</MenuFlyoutSubItem>
225-
226-
<MenuFlyoutSubItem Text="Graphics">
227-
<MenuFlyoutItem Text="Canvas" />
228-
<MenuFlyoutItem Text="Grid" />
229-
</MenuFlyoutSubItem>
230-
</controls:MenuItem>
231-
232-
<controls:MenuItem Header="Debug">
233-
<MenuFlyoutSubItem Text="Windows">
234-
<MenuFlyoutItem Text="Windows 8" />
235-
<MenuFlyoutItem Text="Windows 10" />
236-
</MenuFlyoutSubItem>
237-
238-
<MenuFlyoutSubItem Text="Graphics">
239-
<MenuFlyoutItem Text="Canvas" />
240-
<MenuFlyoutItem Text="Grid" />
241-
</MenuFlyoutSubItem>
242-
</controls:MenuItem>
243-
244-
<controls:MenuItem Header="Debug">
245-
<MenuFlyoutSubItem Text="Windows">
246-
<MenuFlyoutItem Text="Windows 8" />
247-
<MenuFlyoutItem Text="Windows 10" />
248-
</MenuFlyoutSubItem>
249-
250-
<MenuFlyoutSubItem Text="Graphics">
251-
<MenuFlyoutItem Text="Canvas" />
252-
<MenuFlyoutItem Text="Grid" />
253-
</MenuFlyoutSubItem>
254-
</controls:MenuItem>
255-
256-
<controls:MenuItem Header="Debug">
257-
258-
</controls:MenuItem>
259-
260130
</controls:Menu>
261131

262132
<StackPanel Grid.Row="1">

‎Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,40 @@
1919
<Page.Resources>
2020
<DataTemplate x:Key="ButtonTemplate"
2121
x:DataType="local:SampleCategory">
22-
<controls:HamburgerMenuImageItem Thumbnail="{x:Bind Icon}" Label="{x:Bind Name}"/>
22+
<Grid>
23+
<Grid.ColumnDefinitions>
24+
<ColumnDefinition Width="48" />
25+
<ColumnDefinition />
26+
</Grid.ColumnDefinitions>
27+
<Image Margin="16,12"
28+
Source="{x:Bind Icon}"
29+
Stretch="Uniform" />
30+
<TextBlock Grid.Column="1"
31+
VerticalAlignment="Center"
32+
FontSize="16"
33+
Foreground="White"
34+
Text="{x:Bind Name}" />
35+
</Grid>
2336
</DataTemplate>
2437

2538
<DataTemplate x:Key="OptionTemplate"
2639
x:DataType="local:Option">
27-
<controls:HamburgerMenuGlyphItem Glyph="{x:Bind Glyph}" Label="{x:Bind Name}"/>
40+
<Grid>
41+
<Grid.ColumnDefinitions>
42+
<ColumnDefinition Width="48" />
43+
<ColumnDefinition />
44+
</Grid.ColumnDefinitions>
45+
<FontIcon Grid.Column="0"
46+
FontFamily="Segoe MDL2 Assets"
47+
FontSize="16"
48+
Foreground="White"
49+
Glyph="{x:Bind Glyph}" />
50+
<TextBlock Grid.Column="1"
51+
VerticalAlignment="Center"
52+
FontSize="16"
53+
Foreground="White"
54+
Text="{x:Bind Name}" />
55+
</Grid>
2856
</DataTemplate>
2957

3058
</Page.Resources>

0 commit comments

Comments
 (0)