fix light popup theme. fix hint opacity on password box

Author: ButchersBoy

MaterialDesignThemes.Wpf/TextFieldAssist.cs

@@ -148,16 +148,7 @@ private static void ApplyTextBoxViewMargin(Control textBox, Thickness margin)
                 return;
             }
 
-            var scrollViewer = textBox.Template.FindName("PART_ContentHost", textBox) as ScrollViewer;
-            if (scrollViewer == null)
-            {
-                return;
-            }
-
-            var frameworkElement = scrollViewer.Content as FrameworkElement;
-
-            // remove nice new sytax until i get appveyor working	
-            // var frameworkElement = (textBox.Template.FindName("PART_ContentHost", textBox) as ScrollViewer)?.Content as FrameworkElement;
+            var frameworkElement = (textBox.Template.FindName("PART_ContentHost", textBox) as ScrollViewer)?.Content as FrameworkElement;
             if (frameworkElement != null)
             {
                 frameworkElement.Margin = margin;
@@ -200,13 +191,13 @@ private static void HintOpacityPropertyChangedCallback(
             DependencyObject dependencyObject,
             DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
         {
-            var textBoxBase = dependencyObject as TextBoxBase;
-            if (textBoxBase == null)
+            var control = dependencyObject as Control; //could be a text box or password box
+            if (control == null)
             {
                 return;
             }
 
-            textBoxBase.Opacity = (double)dependencyPropertyChangedEventArgs.NewValue;
+            control.Opacity = (double)dependencyPropertyChangedEventArgs.NewValue;
         }
 
         private static void TextPropertyChangedCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)

MaterialDesignThemes.Wpf/Themes/Generic.xaml

@@ -534,15 +534,17 @@
                             <local:Card Margin="22"                                                                                 
                                         Effect="{DynamicResource MaterialDesignShadowDepth5}"
                                         UniformCornerRadius="4"
+                                        TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+                                        TextElement.FontWeight="Medium"
+                                        TextElement.FontSize="14"
+                                        TextOptions.TextFormattingMode="Ideal" 
+                                        TextOptions.TextRenderingMode="Auto"        
+                                        Foreground="{DynamicResource MaterialDesignBody}"
                                         FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto"
                                         IsTabStop="False"
                                         x:Name="Card"
                                         Opacity="0"
                                         RenderTransformOrigin=".5,.5"
-                                        TextElement.FontWeight="Medium"
-                                        TextElement.FontSize="14"
-                                        TextOptions.TextFormattingMode="Ideal" 
-                                        TextOptions.TextRenderingMode="Auto"        
                                         Content="{TemplateBinding DialogContent}"
                                         ContentTemplate="{TemplateBinding DialogContentTemplate}"
                                         ContentTemplateSelector="{TemplateBinding DialogContentTemplateSelector}"