Merge remote-tracking branch 'refs/remotes/ButchersBoy/master' into F…

…ixMenuItem
MaterialDesignInXAML · Oct 10, 2015 · 092b93a · 092b93a
2 parents ee0e75d + 904ff09
commit 092b93a
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/MainDemo.Wpf/Home.xaml b/MainDemo.Wpf/Home.xaml
@@ -19,7 +19,8 @@
             <Image Source="Resources/ms-icon-310x310.png" Stretch="Uniform" Width="100" Height="100" />
             <StackPanel Grid.Column="1" Margin="24 0 0 0">
                 <TextBlock FontSize="32" TextWrapping="Wrap">Welcome to Material Design In XAML Toolkit</TextBlock>
-                <TextBlock Margin="0 8 0 0" TextWrapping="Wrap" Foreground="{DynamicResource MaterialDesignBodyLight}">Use the left-hand menu to checkout the various controls &amp; themes.</TextBlock>
+                <TextBlock Margin="0 8 0 10" TextWrapping="Wrap" Foreground="{DynamicResource MaterialDesignBodyLight}">Click EXPLORE to checkout the various controls &amp; themes.</TextBlock>
+                <Button Command="{x:Static wpf:DrawerHost.OpenDrawerCommand}">EXPLORE</Button>
             </StackPanel>
         </Grid>
         <ScrollViewer Grid.Row="1" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Disabled"

diff --git a/MaterialDesignThemes.Wpf/DrawerHost.cs b/MaterialDesignThemes.Wpf/DrawerHost.cs
@@ -22,13 +22,22 @@ public class DrawerHost : ContentControl
 
         public const string TemplateContentCoverPartName = "PART_ContentCover";
 
+        public static RoutedCommand OpenDrawerCommand = new RoutedCommand();
+        public static RoutedCommand CloseDrawerCommand = new RoutedCommand();
+
         private FrameworkElement _templateContentCoverElement;
 
         static DrawerHost()
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(DrawerHost), new FrameworkPropertyMetadata(typeof(DrawerHost)));
         }
 
+        public DrawerHost()
+        {
+            CommandBindings.Add(new CommandBinding(OpenDrawerCommand, OpenDrawerHandler));
+            CommandBindings.Add(new CommandBinding(CloseDrawerCommand, CloseDrawerHandler));
+        }
+
         public static readonly DependencyProperty LeftDrawerContentProperty = DependencyProperty.Register(
             "LeftDrawerContent", typeof (object), typeof (DrawerHost), new PropertyMetadata(default(object)));
 
@@ -119,5 +128,22 @@ private static void IsLeftDrawerOpenPropertyChangedCallback(DependencyObject dep
             ((DrawerHost)dependencyObject).UpdateVisualStates(true);            
         }
 
+        private void CloseDrawerHandler(object sender, ExecutedRoutedEventArgs executedRoutedEventArgs)
+        {
+            if (executedRoutedEventArgs.Handled) return;
+
+            SetCurrentValue(IsLeftDrawerOpenProperty, false);
+
+            executedRoutedEventArgs.Handled = true;
+        }
+
+        private void OpenDrawerHandler(object sender, ExecutedRoutedEventArgs executedRoutedEventArgs)
+        {
+            if (executedRoutedEventArgs.Handled) return;
+
+            SetCurrentValue(IsLeftDrawerOpenProperty, true);
+
+            executedRoutedEventArgs.Handled = true;
+        }
     }
 }