Merge branch 'master' into release

Author: ButchersBoy

MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj

@@ -54,12 +54,16 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Dragablz.0.0.1.109\lib\net45\Dragablz.dll</HintPath>
     </Reference>
-    <Reference Include="MahApps.Metro, Version=1.1.3.157, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MahApps.Metro.1.1.3-ALPHA157\lib\net45\MahApps.Metro.dll</HintPath>
+    <Reference Include="MahApps.Metro, Version=1.2.0.0, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
+      <HintPath>..\packages\MahApps.Metro.1.2.0.0\lib\net45\MahApps.Metro.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\MahApps.Metro.1.2.0.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Core" />

MahMaterialDragablzMashUp/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Dragablz" version="0.0.1.109" targetFramework="net45" />
-  <package id="MahApps.Metro" version="1.1.3-ALPHA157" targetFramework="net45" />
+  <package id="MahApps.Metro" version="1.2.0.0" targetFramework="net45" />
 </packages>

MainDemo.Wpf/Domain/DemoItem.cs

@@ -1,15 +1,41 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace MaterialDesignColors.WpfExample.Domain
 {
-    public class DemoItem
+    public class DemoItem : INotifyPropertyChanged
     {
-        public string Name { get; set; }
+        private string _name;
+        private object _content;
 
-        public object Content { get; set; }
+        public string Name
+        {
+            get { return _name; }
+            set
+            {
+                this.MutateVerbose(ref _name, value, RaisePropertyChanged());
+            }
+        }
+
+        public object Content
+        {
+            get { return _content; }
+            set
+            {
+                this.MutateVerbose(ref _content, value, RaisePropertyChanged());
+            }
+        }
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        private Action<PropertyChangedEventArgs> RaisePropertyChanged()
+        {
+            return args => PropertyChanged?.Invoke(this, args);
+        }
     }
 }

MainDemo.Wpf/Domain/SampleDialog.xaml

@@ -3,10 +3,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:MaterialDesignColors.WpfExample.Domain"
              xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf;assembly=MaterialDesignThemes.Wpf"
              xmlns:system="clr-namespace:System;assembly=mscorlib"
-             xmlns:wpfExample="clr-namespace:MaterialDesignColors.WpfExample"
              xmlns:materialDesignDemo="clr-namespace:MaterialDesignDemo"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
@@ -51,7 +49,5 @@
                 CANCEL
             </Button>
         </StackPanel>
-        
-            
     </Grid>
 </UserControl>

MainDemo.Wpf/Domain/SimpleDataTemplateSelector.cs

@@ -0,0 +1,15 @@
+using System.Windows;
+using System.Windows.Controls;
+
+namespace MaterialDesignDemo.Domain
+{
+    public class SimpleDataTemplateSelector : DataTemplateSelector
+    {
+        public DataTemplate FixedTemplate { get; set; }
+
+        public override DataTemplate SelectTemplate(object item, DependencyObject container)
+        {
+            return FixedTemplate;
+        }
+    }
+}

MainDemo.Wpf/Domain/TextFieldsViewModel.cs

@@ -42,6 +42,8 @@ public int SelectedValueOne
 
         public IList<int> LongListToTestComboVirtualization { get; }
 
+        public DemoItem DemoItem => new DemoItem { Name = "Mr. Test"};
+
         public event PropertyChangedEventHandler PropertyChanged;
 
         private Action<PropertyChangedEventArgs> RaisePropertyChanged()

MainDemo.Wpf/MainWindow.xaml

@@ -38,8 +38,9 @@
     <materialDesign:DialogHost Identifier="RootDialog">
         <materialDesign:DrawerHost IsLeftDrawerOpen="{Binding ElementName=MenuToggleButton, Path=IsChecked}">
             <materialDesign:DrawerHost.LeftDrawerContent>
-                <StackPanel Orientation="Vertical">
+                <DockPanel MinWidth="212">
                     <ToggleButton Style="{StaticResource MaterialDesignHamburgerToggleButton}" 
+                                  DockPanel.Dock="Top"
                                   HorizontalAlignment="Right" Margin="16"
                                   IsChecked="{Binding ElementName=MenuToggleButton, Path=IsChecked, Mode=TwoWay}" />
                     <ListBox x:Name="DemoItemsListBox" Margin="0 16 0 16" SelectedIndex="0"                         
@@ -168,7 +169,7 @@
                             </domain:DemoItem.Content>
                         </domain:DemoItem>
                     </ListBox>
-                </StackPanel>
+                </DockPanel>
             </materialDesign:DrawerHost.LeftDrawerContent>
             <DockPanel>
                 <materialDesign:ColorZone Padding="16" materialDesign:ShadowAssist.ShadowDepth="Depth2"

MainDemo.Wpf/MaterialDesignDemo.csproj

@@ -101,6 +101,7 @@
       <DependentUpon>SampleProgressDialog.xaml</DependentUpon>
     </Compile>
     <Compile Include="Domain\SelectableViewModel.cs" />
+    <Compile Include="Domain\SimpleDataTemplateSelector.cs" />
     <Compile Include="Domain\TextFieldsViewModel.cs" />
     <Compile Include="Domain\TreesViewModel.cs" />
     <Compile Include="Expander.xaml.cs">