Fix1203 (#1681)

* Fix naming of fields in demo app

* Making sure height of selected item is respected.

Author: Keboo

MainDemo.Wpf/Domain/MainWindowViewModel.cs

@@ -121,10 +121,10 @@ private ObservableCollection<DemoItem> GenerateDemoItems(ISnackbarMessageQueue s
                     DocumentationLink.StyleLink("RatingBar"),
                     DocumentationLink.ApiLink<RatingBar>()
                 }),
-                new DemoItem("Fields", new TextFields(),
+                new DemoItem("Fields", new Fields(),
                     new []
                     {
-                        DocumentationLink.DemoPageLink<TextFields>(),
+                        DocumentationLink.DemoPageLink<Fields>(),
                         DocumentationLink.StyleLink("TextBox"),
                         DocumentationLink.StyleLink("ComboBox"),
                     })

MainDemo.Wpf/Domain/TextFieldsViewModel.cs

@@ -5,14 +5,14 @@
 
 namespace MaterialDesignColors.WpfExample.Domain
 {
-    public class TextFieldsViewModel : INotifyPropertyChanged
+    public class FieldsViewModel : INotifyPropertyChanged
     {
         private string _name;
         private string _name2;
         private int? _selectedValueOne;
         private string _selectedTextTwo;
 
-        public TextFieldsViewModel()
+        public FieldsViewModel()
         {
             LongListToTestComboVirtualization = new List<int>(Enumerable.Range(0, 1000));
 

MainDemo.Wpf/TextFields.xaml renamed to MainDemo.Wpf/Fields.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="MaterialDesignColors.WpfExample.TextFields"
+<UserControl x:Class="MaterialDesignColors.WpfExample.Fields"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -8,8 +8,8 @@
              xmlns:domain1="clr-namespace:MaterialDesignDemo.Domain"
              xmlns:smtx="clr-namespace:ShowMeTheXAML;assembly=ShowMeTheXAML"
              mc:Ignorable="d"
-             d:DesignHeight="300" d:DesignWidth="600" Loaded="UserControl_Loaded"
-             d:DataContext="{d:DesignInstance domain:TextFieldsViewModel, d:IsDesignTimeCreatable=False}">
+             d:DesignHeight="300" d:DesignWidth="600"
+             d:DataContext="{d:DesignInstance domain:FieldsViewModelIsDesignTimeCreatable=False}">
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>

MainDemo.Wpf/TextFields.xaml.cs renamed to MainDemo.Wpf/Fields.xaml.cs

@@ -1,5 +1,4 @@
-using System.Windows;
-using System.Windows.Controls;
+using System.Windows.Controls;
 using System.Windows.Navigation;
 using MaterialDesignColors.WpfExample.Domain;
 using MaterialDesignDemo.Domain;
@@ -9,16 +8,12 @@ namespace MaterialDesignColors.WpfExample
     /// <summary>
     /// Interaction logic for TextFields.xaml
     /// </summary>
-    public partial class TextFields : UserControl
+    public partial class Fields : UserControl
     {
-        public TextFields()
+        public Fields()
         {
             InitializeComponent();
-            DataContext = new TextFieldsViewModel();
-        }
-
-        private void UserControl_Loaded(object sender, RoutedEventArgs e)
-        {
+            DataContext = new FieldsViewModel();
         }
 
         private void Hyperlink_OnRequestNavigate(object sender, RequestNavigateEventArgs e)

MainDemo.Wpf/MaterialDesignDemo.csproj

@@ -138,10 +138,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="ProvingGround.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="RatingBar.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -158,7 +154,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="TextFields.xaml">
+    <Page Include="Fields.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>

MainDemo.Wpf/ProvingGround.xaml

@@ -284,6 +284,11 @@
                     <VisualState Name="Unfocused" />
                 </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
+
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            
             <Border x:Name="BackBorder"
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"