Allowing the DrawerHost to be in either standard or modal (#2232)

This is to match specification https://material.io/components/navigation-drawer

Author: Keboo

MainDemo.Wpf/Drawers.xaml

@@ -18,25 +18,33 @@
             <TextBlock
                 VerticalAlignment="Center"
                 Text="Black Overlay Background"/>
-            
+
             <ToggleButton
                 Margin="8 0 16 0"
                 x:Name="BackgroundToggle" />
 
             <TextBlock
                 VerticalAlignment="Center"
                 Text="Primary Overlay Background"/>
+
+            <TextBlock Text="Open Mode" Margin="30,0,16,0" VerticalAlignment="Center"/>
+            <ComboBox SelectedValue="{Binding OpenMode, ElementName=DrawerHost}"
+                          SelectedValuePath="Content">
+                <ComboBoxItem Content="{x:Static materialDesign:DrawerHostOpenMode.Model}" />
+                <ComboBoxItem Content="{x:Static materialDesign:DrawerHostOpenMode.Standard}" />
+            </ComboBox>
         </StackPanel>
 
         <smtx:XamlDisplay
             UniqueKey="drawers_1"
             MaxHeight="{x:Static system:Double.MaxValue}"
             Margin="5">
             <materialDesign:DrawerHost
-                Margin="32" 
+                x:Name="DrawerHost"
+                Margin="32"
                 HorizontalAlignment="Center" 
                 VerticalAlignment="Center" 
-                BorderThickness="2" 
+                BorderThickness="2"
                 BorderBrush="{DynamicResource MaterialDesignDivider}">
 
                 <materialDesign:DrawerHost.Style>
@@ -48,14 +56,14 @@
                         </Style.Triggers>
                     </Style>
                 </materialDesign:DrawerHost.Style>
-                
+
                 <materialDesign:DrawerHost.LeftDrawerContent>
                     <StackPanel Margin="16">
                         <TextBlock
                             Margin="4"
                             HorizontalAlignment="Center"
                             Text="LEFT FIELD"/>
-                        
+
                         <Button
                             Command="{x:Static materialDesign:DrawerHost.CloseDrawerCommand}"
                             CommandParameter="{x:Static Dock.Left}"
@@ -72,7 +80,7 @@
                             Content="CLOSE ALL"/>
                     </StackPanel>
                 </materialDesign:DrawerHost.LeftDrawerContent>
-                
+
                 <materialDesign:DrawerHost.TopDrawerContent>
                     <StackPanel
                         Margin="16"
@@ -99,22 +107,22 @@
                             Content="CLOSE THIS"/>
                     </StackPanel>
                 </materialDesign:DrawerHost.TopDrawerContent>
-                
+
                 <materialDesign:DrawerHost.RightDrawerContent>
                     <StackPanel Margin="16">
                         <TextBlock
                             Margin="4"
                             HorizontalAlignment="Center"
                             Text="THE RIGHT STUFF"/>
-                        
+
                         <Button
                             Command="{x:Static materialDesign:DrawerHost.CloseDrawerCommand}"
                             CommandParameter="{x:Static Dock.Right}"
                             Margin="4"
                             HorizontalAlignment="Center"
                             Style="{DynamicResource MaterialDesignFlatButton}"
                             Content="CLOSE THIS"/>
-                        
+
                         <Button
                             Command="{x:Static materialDesign:DrawerHost.CloseDrawerCommand}"
                             Margin="4"
@@ -123,7 +131,7 @@
                             Content="CLOSE ALL"/>
                     </StackPanel>
                 </materialDesign:DrawerHost.RightDrawerContent>
-                
+
                 <materialDesign:DrawerHost.BottomDrawerContent>
                     <StackPanel
                         Margin="16"
@@ -150,7 +158,7 @@
                             Content="CLOSE THIS"/>
                     </StackPanel>
                 </materialDesign:DrawerHost.BottomDrawerContent>
-                
+
                 <Grid
                     MinWidth="480"
                     MinHeight="480">
@@ -162,7 +170,7 @@
                             <RowDefinition />
                             <RowDefinition />
                         </Grid.RowDefinitions>
-                        
+
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition />
                             <ColumnDefinition />

MaterialDesignThemes.Wpf/DrawerHost.cs

@@ -86,6 +86,15 @@ public Brush? OverlayBackground
             set => SetValue(OverlayBackgroundProperty, value);
         }
 
+        public DrawerHostOpenMode OpenMode
+        {
+            get => (DrawerHostOpenMode)GetValue(OpenModeProperty);
+            set => SetValue(OpenModeProperty, value);
+        }
+
+        public static readonly DependencyProperty OpenModeProperty =
+            DependencyProperty.Register("OpenMode", typeof(DrawerHostOpenMode), typeof(DrawerHost), new PropertyMetadata(DrawerHostOpenMode.Default));
+
         #region top drawer
 
         public static readonly DependencyProperty TopDrawerContentProperty = DependencyProperty.Register(
@@ -424,10 +433,7 @@ public event EventHandler<DrawerOpenedEventArgs> DrawerOpened
             remove { RemoveHandler(DrawerOpenedEvent, value); }
         }
 
-        protected void OnDrawerOpened(DrawerOpenedEventArgs eventArgs)
-        {
-            RaiseEvent(eventArgs);
-        }
+        protected void OnDrawerOpened(DrawerOpenedEventArgs eventArgs) => RaiseEvent(eventArgs);
 
         #endregion
 
@@ -449,10 +455,7 @@ public event EventHandler<DrawerClosingEventArgs> DrawerClosing
             remove { RemoveHandler(DrawerClosingEvent, value); }
         }
 
-        protected void OnDrawerClosing(DrawerClosingEventArgs eventArgs)
-        {
-            RaiseEvent(eventArgs);
-        }
+        protected void OnDrawerClosing(DrawerClosingEventArgs eventArgs) => RaiseEvent(eventArgs);
 
         #endregion
 
@@ -529,40 +532,32 @@ private void UpdateVisualStates(bool? useTransitions = null)
             var anyOpen = IsTopDrawerOpen || IsLeftDrawerOpen || IsBottomDrawerOpen || IsRightDrawerOpen;
 
             VisualStateManager.GoToState(this,
-                !anyOpen ? TemplateAllDrawersAllClosedStateName : TemplateAllDrawersAnyOpenStateName, useTransitions.HasValue ? useTransitions.Value : !TransitionAssist.GetDisableTransitions(this));
+                !anyOpen ? TemplateAllDrawersAllClosedStateName : TemplateAllDrawersAnyOpenStateName, useTransitions ?? !TransitionAssist.GetDisableTransitions(this));
 
             VisualStateManager.GoToState(this,
-                IsLeftDrawerOpen ? TemplateLeftOpenStateName : TemplateLeftClosedStateName, useTransitions.HasValue ? useTransitions.Value : !TransitionAssist.GetDisableTransitions(this));
+                IsLeftDrawerOpen ? TemplateLeftOpenStateName : TemplateLeftClosedStateName, useTransitions ?? !TransitionAssist.GetDisableTransitions(this));
 
             VisualStateManager.GoToState(this,
-                IsTopDrawerOpen ? TemplateTopOpenStateName : TemplateTopClosedStateName, useTransitions.HasValue ? useTransitions.Value : !TransitionAssist.GetDisableTransitions(this));
+                IsTopDrawerOpen ? TemplateTopOpenStateName : TemplateTopClosedStateName, useTransitions ?? !TransitionAssist.GetDisableTransitions(this));
 
             VisualStateManager.GoToState(this,
-                IsRightDrawerOpen ? TemplateRightOpenStateName : TemplateRightClosedStateName, useTransitions.HasValue ? useTransitions.Value : !TransitionAssist.GetDisableTransitions(this));
+                IsRightDrawerOpen ? TemplateRightOpenStateName : TemplateRightClosedStateName, useTransitions ?? !TransitionAssist.GetDisableTransitions(this));
 
             VisualStateManager.GoToState(this,
-                IsBottomDrawerOpen ? TemplateBottomOpenStateName : TemplateBottomClosedStateName, useTransitions.HasValue ? useTransitions.Value : !TransitionAssist.GetDisableTransitions(this));
+                IsBottomDrawerOpen ? TemplateBottomOpenStateName : TemplateBottomClosedStateName, useTransitions ?? !TransitionAssist.GetDisableTransitions(this));
         }
 
         private static void IsTopDrawerOpenPropertyChangedCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
-        {
-            IsDrawerOpenPropertyChanged(dependencyObject, dependencyPropertyChangedEventArgs, Dock.Top);
-        }
+            => IsDrawerOpenPropertyChanged(dependencyObject, dependencyPropertyChangedEventArgs, Dock.Top);
 
         private static void IsLeftDrawerOpenPropertyChangedCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
-        {
-            IsDrawerOpenPropertyChanged(dependencyObject, dependencyPropertyChangedEventArgs, Dock.Left);
-        }
+            => IsDrawerOpenPropertyChanged(dependencyObject, dependencyPropertyChangedEventArgs, Dock.Left);
 
         private static void IsRightDrawerOpenPropertyChangedCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
-        {
-            IsDrawerOpenPropertyChanged(dependencyObject, dependencyPropertyChangedEventArgs, Dock.Right);
-        }
+            => IsDrawerOpenPropertyChanged(dependencyObject, dependencyPropertyChangedEventArgs, Dock.Right);
 
         private static void IsBottomDrawerOpenPropertyChangedCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
-        {
-            IsDrawerOpenPropertyChanged(dependencyObject, dependencyPropertyChangedEventArgs, Dock.Bottom);
-        }
+            => IsDrawerOpenPropertyChanged(dependencyObject, dependencyPropertyChangedEventArgs, Dock.Bottom);
 
         private static void IsDrawerOpenPropertyChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs, Dock dock)
         {
@@ -630,9 +625,9 @@ private void OpenDrawerHandler(object sender, ExecutedRoutedEventArgs executedRo
 
         private void SetOpenFlag(ExecutedRoutedEventArgs executedRoutedEventArgs, bool value)
         {
-            if (executedRoutedEventArgs.Parameter is Dock)
+            if (executedRoutedEventArgs.Parameter is Dock dock)
             {
-                switch ((Dock)executedRoutedEventArgs.Parameter)
+                switch (dock)
                 {
                     case Dock.Left:
                         SetCurrentValue(IsLeftDrawerOpenProperty, value);

MaterialDesignThemes.Wpf/DrawerHostOpenMode.cs

@@ -0,0 +1,9 @@
+namespace MaterialDesignThemes.Wpf
+{
+    public enum DrawerHostOpenMode
+    {
+        Default = 0,
+        Model = 0,
+        Standard = 1
+    }
+}