Merge branch 'master' into IconPack

ButchersBoy · ButchersBoy · commit 6feb3648533a · 2016-01-15T14:58:48.000Z
diff --git a/MainDemo.Wpf/Buttons.xaml b/MainDemo.Wpf/Buttons.xaml
@@ -108,15 +108,15 @@
         <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="0 16 0 0">
             <Button Style="{StaticResource MaterialDesignRaisedLightButton}" Margin="0 0 8 0" Width="100"
                     ToolTip="Resource name: MaterialDesignRaisedLightButton">
-                LIGHT
+                _LIGHT
             </Button>
             <Button Style="{StaticResource MaterialDesignRaisedButton}" Margin="0 0 8 0" Width="100"
                     ToolTip="Resource name: MaterialDesignRaisedButton">
-                MID
+                _MID
             </Button>
             <Button Style="{StaticResource MaterialDesignRaisedDarkButton}" Margin="0 0 8 0" Width="100"
                     ToolTip="Resource name: MaterialDesignRaisedLightDarkButton">
-                DARK
+                _DARK
             </Button>
             <Button Style="{StaticResource MaterialDesignRaisedAccentButton}" Margin="0 0 8 0" Width="100"
                     ToolTip="Resource name: MaterialDesignRaisedAccentButton">
diff --git a/MainDemo.Wpf/TextFields.xaml b/MainDemo.Wpf/TextFields.xaml
@@ -20,7 +20,9 @@
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.TextBox.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource MaterialDesignTextBox}">
-                <Setter Property="HorizontalAlignment" Value="Stretch" />
+                <Setter Property="Margin" Value="0 8 0 8" />
+            </Style>
+            <Style TargetType="{x:Type PasswordBox}" BasedOn="{StaticResource MaterialDesignPasswordBox}">
                 <Setter Property="Margin" Value="0 8 0 8" />
             </Style>
             <Style TargetType="{x:Type ComboBox}" BasedOn="{StaticResource MaterialDesignComboBox}">
diff --git a/MaterialDesignThemes.Wpf/PasswordFieldAssist.cs b/MaterialDesignThemes.Wpf/PasswordFieldAssist.cs
@@ -17,13 +17,14 @@ private static void ManagedPropertyChangedCallback(DependencyObject dependencyOb
             if (passwordBox != null)
             {
                 passwordBox.PasswordChanged -= PasswordBoxOnPasswordChanged;
+                passwordBox.Loaded -= PasswordBoxOnPasswordChanged;
             }
 
             passwordBox = dependencyPropertyChangedEventArgs.NewValue as PasswordBox;
             if (passwordBox != null)
             {
                 passwordBox.PasswordChanged += PasswordBoxOnPasswordChanged;
-                ConfigureHint(passwordBox);
+                passwordBox.Loaded += PasswordBoxOnPasswordChanged;
             }
         }
 
@@ -56,43 +57,61 @@ private static void ConfigureHint(PasswordBox passwordBox)
             passwordBox.SetValue(HintVisibilityProperty, passwordBox.SecurePassword.Length == 0 ? Visibility.Visible : Visibility.Hidden);
         }
 
+        /// <summary>
+        /// Framework use only.
+        /// </summary>
         public static readonly DependencyProperty HintVisibilityProperty = DependencyProperty.RegisterAttached(
             "HintVisibility", typeof(Visibility), typeof(PasswordFieldAssist), new PropertyMetadata(default(Visibility)));
 
+        /// <summary>
+        /// Framework use only.
+        /// </summary>
         public static void SetHintVisibility(DependencyObject element, Visibility value)
         {
             element.SetValue(HintVisibilityProperty, value);
         }
 
+        /// <summary>
+        /// Framework use only.
+        /// </summary>
         public static Visibility GetHintVisibility(DependencyObject element)
         {
             return (Visibility)element.GetValue(HintVisibilityProperty);
         }
 
+        /// <summary>
+        /// Framework use only.
+        /// </summary>
+        /// <param name="element"></param>
+        /// <param name="value"></param>
         public static void SetManaged(DependencyObject element, PasswordBox value)
         {
             element.SetValue(ManagedProperty, value);
         }
 
+        /// <summary>
+        /// Framework use only.
+        /// </summary>
         public static PasswordBox GetManaged(DependencyObject element)
         {
             return (PasswordBox)element.GetValue(ManagedProperty);
         }
 
+        /// <summary>
+        /// Framework use only.
+        /// </summary>
         private static void SetIsNullOrEmpty(DependencyObject element, bool value)
         {
             element.SetValue(IsNullOrEmptyPropertyKey, value);
         }
 
+        /// <summary>
+        /// Framework use only.
+        /// </summary>
         public static bool GetIsNullOrEmpty(DependencyObject element)
         {
             return (bool)element.GetValue(IsNullOrEmptyProperty);
         }
     }
-
-    public static class ProgressBarAssist
-    {
-
-
-    }
+    
 }
diff --git a/MaterialDesignThemes.Wpf/Ripple.cs b/MaterialDesignThemes.Wpf/Ripple.cs
@@ -140,7 +140,25 @@ public double RippleY
         {
             get { return (double)GetValue(RippleYProperty); }
             private set { SetValue(RippleYPropertyKey, value); }
-        }       
+        }
+
+        /// <summary>
+        ///   The DependencyProperty for the RecognizesAccessKey property. 
+        ///   Default Value: false 
+        /// </summary> 
+        public static readonly DependencyProperty RecognizesAccessKeyProperty =
+            DependencyProperty.Register(
+                "RecognizesAccessKey", typeof(bool), typeof(Ripple),
+                new PropertyMetadata(default(bool)));
+
+        /// <summary> 
+        ///   Determine if Ripple should use AccessText in its style
+        /// </summary> 
+        public bool RecognizesAccessKey
+        {
+            get { return (bool)GetValue(RecognizesAccessKeyProperty); }
+            set { SetValue(RecognizesAccessKeyProperty, value); }
+        }
 
         public override void OnApplyTemplate()
         {
diff --git a/MaterialDesignThemes.Wpf/TextFieldAssist.cs b/MaterialDesignThemes.Wpf/TextFieldAssist.cs
@@ -52,6 +52,12 @@ public static class TextFieldAssist
         private static readonly DependencyProperty IsNullOrEmptyProperty =
             IsNullOrEmptyPropertyKey.DependencyProperty;
 
+        /// <summary>
+        /// Framework use only.
+        /// </summary>
+        public static readonly DependencyProperty ManagedProperty = DependencyProperty.RegisterAttached(
+            "Managed", typeof(TextBox), typeof(TextFieldAssist), new PropertyMetadata(default(TextBox), ManagedPropertyChangedCallback));        
+
         #endregion
 
         #region Public Methods and Operators
@@ -132,6 +138,24 @@ public static string GetText(DependencyObject element)
             return (string)element.GetValue(TextProperty);
         }
 
+        /// <summary>
+        /// Framework use only.
+        /// </summary>
+        public static void SetManaged(DependencyObject element, TextBox value)
+        {
+            element.SetValue(ManagedProperty, value);
+        }
+
+        /// <summary>
+        /// Framework use only.
+        /// </summary>
+        /// <param name="element"></param>
+        /// <returns></returns>
+        public static TextBox GetManaged(DependencyObject element)
+        {
+            return (TextBox) element.GetValue(ManagedProperty);
+        }
+
         #endregion
 
         #region Methods
@@ -199,11 +223,44 @@ private static void TextPropertyChangedCallback(DependencyObject dependencyObjec
             else
             {
                 frameworkElement.Loaded += (sender, args) => VisualStateManager.GoToState(frameworkElement, state, false);
+                frameworkElement.IsVisibleChanged += (sender, args) => VisualStateManager.GoToState(frameworkElement, state, true);
             }
 
             SetIsNullOrEmpty(dependencyObject, string.IsNullOrEmpty((dependencyPropertyChangedEventArgs.NewValue ?? "").ToString()));
         }
 
+        private static void ManagedPropertyChangedCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
+        {
+            var textBox = dependencyPropertyChangedEventArgs.OldValue as TextBox;
+            if (textBox != null)
+            {
+                textBox.IsVisibleChanged -= ManagedTextBoxOnIsVisibleChanged;                
+            }
+
+            textBox = dependencyPropertyChangedEventArgs.NewValue as TextBox;
+            if (textBox != null)
+            {
+                textBox.IsVisibleChanged += ManagedTextBoxOnIsVisibleChanged;                
+            }
+        }
+
+        private static void ManagedTextBoxOnIsVisibleChanged(object sender, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
+        {
+            var textBox = (TextBox)sender;
+
+            if (!textBox.IsVisible) return;
+
+            var state = string.IsNullOrEmpty(textBox.Text)
+                ? "MaterialDesignStateTextEmpty"
+                : "MaterialDesignStateTextNotEmpty";
+
+            //yep, had to invoke post this to trigger refresh
+            textBox.Dispatcher.BeginInvoke(new Action(() =>
+            {
+                VisualStateManager.GoToState(textBox, state, false);
+            }));
+        }
+
         private static void SetIsNullOrEmpty(DependencyObject element, bool value)
         {
             element.SetValue(IsNullOrEmptyPropertyKey, value);
diff --git a/MaterialDesignThemes.Wpf/Themes/Generic.xaml b/MaterialDesignThemes.Wpf/Themes/Generic.xaml
@@ -32,6 +32,7 @@
     <converters:DrawerOffsetConverter x:Key="DrawerOffsetConverter" />
     
     <Style TargetType="{x:Type local:Ripple}">
+        <Setter Property="RecognizesAccessKey" Value="True" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Stretch" />
         <Setter Property="Background" Value="Transparent" />
@@ -133,11 +134,14 @@
                             </Ellipse>
                         </Canvas>
                         <ContentPresenter Content="{TemplateBinding Content}"
+                                          ContentStringFormat="{TemplateBinding ContentStringFormat}"
                                           ContentTemplate="{TemplateBinding ContentTemplate}"
                                           ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
                                           Margin="{TemplateBinding Padding}"
                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          RecognizesAccessKey="{TemplateBinding RecognizesAccessKey}"
+                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.CheckBox.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.CheckBox.xaml
@@ -47,6 +47,8 @@
     <Style x:Key="MaterialDesignCheckBox" TargetType="{x:Type CheckBox}">
         <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
         <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Background" Value="{DynamicResource PrimaryHueMidBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueMidBrush}"/>
         <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}"/>
         <Setter Property="Template">
             <Setter.Value>
@@ -114,7 +116,7 @@
                         <Trigger Property="IsPressed" Value="true"/>
                         <Trigger Property="IsChecked" Value="true">
                             <Setter Property="Data" TargetName="Graphic" Value="M10,17L5,12L6.41,10.58L10,14.17L17.59,6.58L19,8M19,3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3Z" />
-                            <Setter Property="Fill" TargetName="Graphic" Value="{DynamicResource PrimaryHueMidBrush}" />
+                            <Setter Property="Fill" TargetName="Graphic" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Background}" />
                         </Trigger>
                         <Trigger Property="IsChecked" Value="{x:Null}">
                             <Setter Property="Data" TargetName="Graphic" Value="M10,17L5,12L6.41,10.58L10,14.17L17.59,6.58L19,8M19,3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3Z" />
@@ -126,6 +128,24 @@
         </Setter>
     </Style>
     
+    <Style x:Key="MaterialDesignLightCheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource MaterialDesignCheckBox}">
+        <Setter Property="Background" Value="{DynamicResource PrimaryHueLightBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueLightBrush}"/>
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryHueLightForegroundBrush}"/>
+    </Style>
+
+    <Style x:Key="MaterialDesignDarkCheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource MaterialDesignCheckBox}">
+        <Setter Property="Background" Value="{DynamicResource PrimaryHueDarkBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueDarkBrush}"/>
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryHueDarkForegroundBrush}"/>
+    </Style>
+
+    <Style x:Key="MaterialDesignAccentCheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource MaterialDesignCheckBox}">
+        <Setter Property="Background" Value="{DynamicResource SecondaryAccentBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryAccentBrush}"/>
+        <Setter Property="Foreground" Value="{DynamicResource SecondaryAccentForegroundBrush}"/>
+    </Style>
+
     <Style x:Key="MaterialDesignUserForegroundCheckBox" TargetType="{x:Type CheckBox}">
         <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
         <Setter Property="BorderThickness" Value="1"/>
@@ -206,4 +226,4 @@
         </Setter>
     </Style>
 
-</ResourceDictionary>
+</ResourceDictionary>
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
@@ -16,8 +16,8 @@
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="CaretBrush" Value="{Binding RelativeSource={RelativeSource Self}, Path=BorderBrush}"/>
         <Setter Property="KeyboardNavigation.TabNavigation" Value="None"/>
-        <Setter Property="HorizontalContentAlignment" Value="Left"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Stretch"/>
         <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="AllowDrop" Value="true"/>
         <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
@@ -27,23 +27,23 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type PasswordBox}">
-                    <Grid VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                    <Grid>
                         <Border x:Name="border"
                                 BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"
                                 Background="{TemplateBinding Background}"
                                 SnapsToDevicePixels="True"
-                                Padding="0 4 0 4" VerticalAlignment="Center">
-                            <Grid Margin="{TemplateBinding Padding}">
-                                <ScrollViewer x:Name="PART_ContentHost"
-                                              Focusable="false"
-                                              HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"
-                                              TextElement.FontFamily="Times New Roman" />
+                                Padding="0 4 0 4">
+                            <Grid Margin="{TemplateBinding Padding}"
+                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                                <ScrollViewer x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"
+                                              />
                                 <TextBlock Text="{Binding Path=(wpf:TextFieldAssist.Hint), RelativeSource={RelativeSource TemplatedParent}}"
-                                                   Visibility="{Binding Path=(wpf:PasswordFieldAssist.HintVisibility), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                                   Margin="1 0 1 0"
+                                           Visibility="{Binding Path=(wpf:PasswordFieldAssist.HintVisibility), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                            IsHitTestVisible="False"
-                                                   x:Name="Hint"
-                                                   Opacity="{Binding Path=(wpf:TextFieldAssist.HintOpacity), RelativeSource={RelativeSource TemplatedParent}}" />
+                                           x:Name="Hint"
+                                           Margin="1 0 1 0"
+                                           Opacity="{Binding Path=(wpf:TextFieldAssist.HintOpacity), RelativeSource={RelativeSource TemplatedParent}}" />
                             </Grid>
                         </Border>
                         <wpf:Underline x:Name="Underline"/>
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.RadioButton.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.RadioButton.xaml
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToggleButton.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToggleButton.xaml

Original file line number	Diff line number	Diff line change
`@@ -17,13 +17,14 @@ private static void ManagedPropertyChangedCallback(DependencyObject dependencyOb`
`17`	`17`	`if (passwordBox != null)`
`18`	`18`	`{`
`19`	`19`	`passwordBox.PasswordChanged -= PasswordBoxOnPasswordChanged;`
	`20`	`+ passwordBox.Loaded -= PasswordBoxOnPasswordChanged;`
`20`	`21`	`}`
`21`	`22`
`22`	`23`	`passwordBox = dependencyPropertyChangedEventArgs.NewValue as PasswordBox;`
`23`	`24`	`if (passwordBox != null)`
`24`	`25`	`{`
`25`	`26`	`passwordBox.PasswordChanged += PasswordBoxOnPasswordChanged;`
`26`		`- ConfigureHint(passwordBox);`
	`27`	`+ passwordBox.Loaded += PasswordBoxOnPasswordChanged;`
`27`	`28`	`}`
`28`	`29`	`}`
`29`	`30`
`@@ -56,43 +57,61 @@ private static void ConfigureHint(PasswordBox passwordBox)`
`56`	`57`	`passwordBox.SetValue(HintVisibilityProperty, passwordBox.SecurePassword.Length == 0 ? Visibility.Visible : Visibility.Hidden);`
`57`	`58`	`}`
`58`	`59`
	`60`	`+ /// <summary>`
	`61`	`+ /// Framework use only.`
	`62`	`+ /// </summary>`
`59`	`63`	`public static readonly DependencyProperty HintVisibilityProperty = DependencyProperty.RegisterAttached(`
`60`	`64`	`"HintVisibility", typeof(Visibility), typeof(PasswordFieldAssist), new PropertyMetadata(default(Visibility)));`
`61`	`65`
	`66`	`+ /// <summary>`
	`67`	`+ /// Framework use only.`
	`68`	`+ /// </summary>`
`62`	`69`	`public static void SetHintVisibility(DependencyObject element, Visibility value)`
`63`	`70`	`{`
`64`	`71`	`element.SetValue(HintVisibilityProperty, value);`
`65`	`72`	`}`
`66`	`73`
	`74`	`+ /// <summary>`
	`75`	`+ /// Framework use only.`
	`76`	`+ /// </summary>`
`67`	`77`	`public static Visibility GetHintVisibility(DependencyObject element)`
`68`	`78`	`{`
`69`	`79`	`return (Visibility)element.GetValue(HintVisibilityProperty);`
`70`	`80`	`}`
`71`	`81`
	`82`	`+ /// <summary>`
	`83`	`+ /// Framework use only.`
	`84`	`+ /// </summary>`
	`85`	`+ /// <param name="element"></param>`
	`86`	`+ /// <param name="value"></param>`
`72`	`87`	`public static void SetManaged(DependencyObject element, PasswordBox value)`
`73`	`88`	`{`
`74`	`89`	`element.SetValue(ManagedProperty, value);`
`75`	`90`	`}`
`76`	`91`
	`92`	`+ /// <summary>`
	`93`	`+ /// Framework use only.`
	`94`	`+ /// </summary>`
`77`	`95`	`public static PasswordBox GetManaged(DependencyObject element)`
`78`	`96`	`{`
`79`	`97`	`return (PasswordBox)element.GetValue(ManagedProperty);`
`80`	`98`	`}`
`81`	`99`
	`100`	`+ /// <summary>`
	`101`	`+ /// Framework use only.`
	`102`	`+ /// </summary>`
`82`	`103`	`private static void SetIsNullOrEmpty(DependencyObject element, bool value)`
`83`	`104`	`{`
`84`	`105`	`element.SetValue(IsNullOrEmptyPropertyKey, value);`
`85`	`106`	`}`
`86`	`107`
	`108`	`+ /// <summary>`
	`109`	`+ /// Framework use only.`
	`110`	`+ /// </summary>`
`87`	`111`	`public static bool GetIsNullOrEmpty(DependencyObject element)`
`88`	`112`	`{`
`89`	`113`	`return (bool)element.GetValue(IsNullOrEmptyProperty);`
`90`	`114`	`}`
`91`	`115`	`}`
`92`		`-`
`93`		`- public static class ProgressBarAssist`
`94`		`- {`
`95`		`-`
`96`		`-`
`97`		`- }`
	`116`	`+`
`98`	`117`	`}`