Merge branch 'master' of https://github.com/jizc/MaterialDesignInXamlToolkit into jizc-master

ButchersBoy · ButchersBoy · commit 31e0dc6b5865 · 2017-08-05T16:16:10.000+01:00
diff --git a/MaterialDesignThemes.Wpf/ValidationAssist.cs b/MaterialDesignThemes.Wpf/ValidationAssist.cs
@@ -45,12 +45,12 @@ public static void SetOnlyShowOnFocus(DependencyObject element, bool value)
 
         public static bool GetUsePopup(DependencyObject element)
         {
-            return (bool)element.GetValue(OnlyShowOnFocusProperty);
+            return (bool)element.GetValue(UsePopupProperty);
         }
 
         public static void SetUsePopup(DependencyObject element, bool value)
         {
-            element.SetValue(OnlyShowOnFocusProperty, value);
+            element.SetValue(UsePopupProperty, value);
         }
 
         #endregion

Original file line number	Diff line number	Diff line change
`@@ -45,12 +45,12 @@ public static void SetOnlyShowOnFocus(DependencyObject element, bool value)`
`45`	`45`
`46`	`46`	`public static bool GetUsePopup(DependencyObject element)`
`47`	`47`	`{`
`48`		`- return (bool)element.GetValue(OnlyShowOnFocusProperty);`
	`48`	`+ return (bool)element.GetValue(UsePopupProperty);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public static void SetUsePopup(DependencyObject element, bool value)`
`52`	`52`	`{`
`53`		`- element.SetValue(OnlyShowOnFocusProperty, value);`
	`53`	`+ element.SetValue(UsePopupProperty, value);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`#endregion`