Skip to content

Commit c711809

Browse files
nmetulevnmetulev
committed
changed type
1 parent 734fba0 commit c711809

File tree

3 files changed

+54
-55
lines changed

3 files changed

+54
-55
lines changed

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

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -9,38 +9,38 @@
99
mc:Ignorable="d">
1010

1111
<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-
FontFamily="Segoe MDL2 Assets"
20-
Glyph="{Binding Glyph}"
21-
Foreground="White" />
22-
<TextBlock Grid.Column="1"
23-
Text="{x:Bind Label}"
24-
Foreground="White"
25-
FontSize="16"
26-
VerticalAlignment="Center" />
27-
</Grid>
28-
</DataTemplate>
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+
FontFamily="Segoe MDL2 Assets"
20+
Glyph="{Binding Glyph}"
21+
Foreground="White" />
22+
<TextBlock Grid.Column="1"
23+
Text="{x:Bind Label}"
24+
Foreground="White"
25+
FontSize="16"
26+
VerticalAlignment="Center" />
27+
</Grid>
28+
</DataTemplate>
2929

30-
<DataTemplate x:Key="HamburgerMenuImageItem" x:DataType="controls:HamburgerMenuGlyphItem">
31-
<Grid>
32-
<Grid.ColumnDefinitions>
33-
<ColumnDefinition Width="48" />
34-
<ColumnDefinition />
35-
</Grid.ColumnDefinitions>
36-
<Image Source="{Binding Glyph}" Stretch="UniformToFill" Margin="12,12,11,12" />
37-
<TextBlock Grid.Column="1"
38-
Text="{x:Bind Label}"
39-
Foreground="White"
40-
FontSize="16"
41-
VerticalAlignment="Center" />
42-
</Grid>
43-
</DataTemplate>
30+
<DataTemplate x:Key="HamburgerMenuImageItem" x:DataType="controls:HamburgerMenuImageItem">
31+
<Grid>
32+
<Grid.ColumnDefinitions>
33+
<ColumnDefinition Width="48" />
34+
<ColumnDefinition />
35+
</Grid.ColumnDefinitions>
36+
<Image Source="{Binding Thumbnail}" Stretch="UniformToFill" Margin="12,12,11,12" />
37+
<TextBlock Grid.Column="1"
38+
Text="{x:Bind Label}"
39+
Foreground="White"
40+
FontSize="16"
41+
VerticalAlignment="Center" />
42+
</Grid>
43+
</DataTemplate>
4444
</Page.Resources>
4545

4646
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Margin="50" BorderThickness="1" BorderBrush="Black">
@@ -58,16 +58,16 @@
5858
IsPaneOpen="@[IsPaneOpen:Bool:False]">
5959
<!-- Items -->
6060
<controls:HamburgerMenu.ItemsSource>
61-
<controls:HamburgerMenuItemCollection>
62-
<controls:HamburgerMenuGlyphItem Label="Big four summer heat"
63-
Glyph="/Assets/Photos/BigFourSummerHeat.jpg"/>
64-
<controls:HamburgerMenuGlyphItem Label="Bison badlands Chillin"
65-
Glyph="/Assets/Photos/BisonBadlandsChillin.jpg"/>
66-
<controls:HamburgerMenuGlyphItem Label="Giant slab in Oregon"
67-
Glyph="/Assets/Photos/GiantSlabInOregon.jpg"/>
68-
<controls:HamburgerMenuGlyphItem Label="Lake Ann Mushroom"
69-
Glyph="/Assets/Photos/LakeAnnMushroom.jpg"/>
70-
</controls:HamburgerMenuItemCollection>
61+
<controls:HamburgerMenuItemCollection>
62+
<controls:HamburgerMenuImageItem Label="Big four summer heat"
63+
Thumbnail="/Assets/Photos/BigFourSummerHeat.jpg"/>
64+
<controls:HamburgerMenuImageItem Label="Bison badlands Chillin"
65+
Thumbnail="/Assets/Photos/BisonBadlandsChillin.jpg"/>
66+
<controls:HamburgerMenuImageItem Label="Giant slab in Oregon"
67+
Thumbnail="/Assets/Photos/GiantSlabInOregon.jpg"/>
68+
<controls:HamburgerMenuImageItem Label="Lake Ann Mushroom"
69+
Thumbnail="/Assets/Photos/LakeAnnMushroom.jpg"/>
70+
</controls:HamburgerMenuItemCollection>
7171
</controls:HamburgerMenu.ItemsSource>
7272

7373
<!-- Options -->

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
</Grid>
2626
</DataTemplate>
2727

28-
<DataTemplate x:Key="HamburgerMenuImageItem" x:DataType="controls:HamburgerMenuGlyphItem">
28+
<DataTemplate x:Key="HamburgerMenuImageItem" x:DataType="controls:HamburgerMenuImageItem">
2929
<Grid>
3030
<Grid.ColumnDefinitions>
3131
<ColumnDefinition Width="48" />
3232
<ColumnDefinition />
3333
</Grid.ColumnDefinitions>
34-
<Image Source="{Binding Glyph}" Stretch="UniformToFill" Margin="12,12,11,12" />
34+
<Image Source="{Binding Thumbnail}" Stretch="UniformToFill" Margin="12,12,11,12" />
3535
<TextBlock Grid.Column="1"
3636
Text="{x:Bind Label}"
3737
Foreground="White"
@@ -59,16 +59,16 @@
5959
PaneBackground="{Binding PaneBackground.Value}">
6060
<!-- Items -->
6161
<controls:HamburgerMenu.ItemsSource>
62-
<controls:HamburgerMenuItemCollection>
63-
<controls:HamburgerMenuGlyphItem Label="Big four summer heat"
64-
Glyph="/Assets/Photos/BigFourSummerHeat.jpg"/>
65-
<controls:HamburgerMenuGlyphItem Label="Bison badlands Chillin"
66-
Glyph="/Assets/Photos/BisonBadlandsChillin.jpg"/>
67-
<controls:HamburgerMenuGlyphItem Label="Giant slab in Oregon"
68-
Glyph="/Assets/Photos/GiantSlabInOregon.jpg"/>
69-
<controls:HamburgerMenuGlyphItem Label="Lake Ann Mushroom"
70-
Glyph="/Assets/Photos/LakeAnnMushroom.jpg"/>
71-
</controls:HamburgerMenuItemCollection>
62+
<controls:HamburgerMenuItemCollection>
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"/>
71+
</controls:HamburgerMenuItemCollection>
7272
</controls:HamburgerMenu.ItemsSource>
7373

7474
<!-- Options -->
@@ -96,7 +96,7 @@
9696
</Border>
9797
<Image x:Name="Image"
9898
Grid.Row="1"
99-
Source="{Binding Glyph}" />
99+
Source="{Binding Thumbnail}" />
100100
</Grid>
101101
</controls:HamburgerMenu>
102102
</Grid>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656

5757
</Page.Resources>
5858
<controls:HamburgerMenu x:Name="HamburgerMenu"
59-
OpenPaneLength="240"
6059
Foreground="{StaticResource Brush-Grey-04}"
6160
ItemClick="HamburgerMenu_OnItemClick"
6261
ItemTemplate="{StaticResource ButtonTemplate}"

0 commit comments

Comments
 (0)