Merge branch 'develop'

.editorconfig

@@ -9,7 +9,7 @@ end_of_line = CRLF
 indent_style = space
 indent_size = 4
 
-[*.{md,yml}]
+[*.{md,yml,json}]
 indent_style = space
 indent_size = 2
 

GitVersion.yml

@@ -1,7 +1,7 @@
 assembly-versioning-scheme: Major
 assembly-file-versioning-scheme: MajorMinorPatchTag
 mode: ContinuousDeployment
-next-version: 2.0.0
+next-version: 2.1.0
 branches:
  master:
  mode: ContinuousDeployment

src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DataGridExamples.xaml

@@ -165,6 +165,7 @@
  Grid.Column="1"
  Margin="5"
  AutoGenerateColumns="False"
+ EnableColumnVirtualization="True"
  EnableRowVirtualization="True"
  HeadersVisibility="All"
  ItemsSource="{Binding Path=Albums}"
@@ -191,23 +192,18 @@
  </GroupStyle>
  </DataGrid.GroupStyle>
  <DataGrid.Columns>
- <DataGridCheckBoxColumn Binding="{Binding RelativeSource={RelativeSource AncestorType=DataGridRow}, Path=IsSelected, Mode=OneWay}"
- EditingElementStyle="{DynamicResource MahApps.Styles.CheckBox.DataGrid}"
- ElementStyle="{DynamicResource MahApps.Styles.CheckBox.DataGrid}"
- Header="Row Selected" />
+ <DataGridCheckBoxColumn Binding="{Binding RelativeSource={RelativeSource AncestorType=DataGridRow}, Path=IsSelected, Mode=OneWay}" Header="Row Selected" />
  <DataGridCheckBoxColumn Binding="{Binding IsSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
  EditingElementStyle="{DynamicResource MahApps.Styles.CheckBox.DataGrid.Win10}"
  ElementStyle="{DynamicResource MahApps.Styles.CheckBox.DataGrid.Win10}"
  Header="Album Selected" />
- <DataGridTextColumn Binding="{Binding Title}"
- EditingElementStyle="{StaticResource MahApps.Styles.TextBox.DataGrid.Editing}"
- Header="Title" />
- <DataGridTextColumn Binding="{Binding Artist.Name}"
- EditingElementStyle="{StaticResource MahApps.Styles.TextBox.DataGrid.Editing}"
- Header="Artist" />
- <DataGridTextColumn Binding="{Binding Genre.Name}"
- EditingElementStyle="{StaticResource MahApps.Styles.TextBox.DataGrid.Editing}"
- Header="Genre" />
+ <DataGridTextColumn Binding="{Binding Title}" Header="Title" />
+ <DataGridTextColumn Binding="{Binding Artist.Name}" Header="Artist" />
+ <DataGridComboBoxColumn DisplayMemberPath="Name"
+ Header="Artist"
+ ItemsSource="{x:Static models:SampleData.Artists}"
+ SelectedItemBinding="{Binding Artist}" />
+ <DataGridTextColumn Binding="{Binding Genre.Name}" Header="Genre" />
  <controls:DataGridNumericUpDownColumn Binding="{Binding Price}"
  Header="Price"
  Minimum="0"
@@ -262,15 +258,9 @@
  RowHeaderWidth="0"
  Style="{DynamicResource MahApps.Styles.DataGrid.Azure}">
  <DataGrid.Columns>
- <DataGridTextColumn Binding="{Binding Title}"
- EditingElementStyle="{StaticResource MahApps.Styles.TextBox.DataGrid.Editing}"
- Header="Title" />
- <DataGridTextColumn Binding="{Binding Artist.Name}"
- EditingElementStyle="{StaticResource MahApps.Styles.TextBox.DataGrid.Editing}"
- Header="Artist" />
- <DataGridTextColumn Binding="{Binding Genre.Name}"
- EditingElementStyle="{StaticResource MahApps.Styles.TextBox.DataGrid.Editing}"
- Header="Genre" />
+ <DataGridTextColumn Binding="{Binding Title}" Header="Title" />
+ <DataGridTextColumn Binding="{Binding Artist.Name}" Header="Artist" />
+ <DataGridTextColumn Binding="{Binding Genre.Name}" Header="Genre" />
  <DataGridTemplateColumn Header="Price">
  <DataGridTemplateColumn.CellTemplate>
  <DataTemplate>

src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuCreatorsUpdate.xaml

@@ -162,7 +162,7 @@
  <!-- Items -->
  <Controls:HamburgerMenu.ItemsSource>
  <Controls:HamburgerMenuItemCollection>
- <Controls:HamburgerMenuHeaderItem Label="Pictures" />
+ <Controls:HamburgerMenuHeaderItem AutomationProperties.Name="The Pictures Header" Label="Pictures" />
  <Controls:HamburgerMenuGlyphItem Glyph="/Assets/Photos/BigFourSummerHeat.png" Label="Big four summer heat" />
  <Controls:HamburgerMenuGlyphItem Glyph="/Assets/Photos/BisonBadlandsChillin.png" Label="Bison badlands Chillin" />
  <Controls:HamburgerMenuSeparatorItem />

src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuDefault.xaml

@@ -205,7 +205,10 @@
  <!-- Items -->
  <Controls:HamburgerMenu.ItemsSource>
  <Controls:HamburgerMenuItemCollection>
- <Controls:HamburgerMenuGlyphItem Glyph="/Assets/Photos/BigFourSummerHeat.png" Label="Big four summer heat" />
+ <Controls:HamburgerMenuGlyphItem AutomationProperties.HelpText="First Item shows BigFourSummerHeat"
+ AutomationProperties.Name="First Item"
+ Glyph="/Assets/Photos/BigFourSummerHeat.png"
+ Label="Big four summer heat" />
  <Controls:HamburgerMenuGlyphItem Glyph="/Assets/Photos/BisonBadlandsChillin.png" Label="Bison badlands Chillin" />
  <Controls:HamburgerMenuGlyphItem Glyph="/Assets/Photos/GiantSlabInOregon.png" Label="Giant slab in Oregon" />
  <Controls:HamburgerMenuGlyphItem Glyph="/Assets/Photos/LakeAnnMushroom.png" Label="Lake Ann Mushroom" />