Fix #82

Author: sourcechord

FluentWPF/Extensions.cs

@@ -81,8 +81,67 @@ public static Brush GetPlaceholderForegroundBrush(UIElement element)
             return (Brush)element.GetValue(PlaceholderForegroundBrushProperty);
         }
 
-    }
 
 
 
+        #region PasswordBox Attached Prperties
+
+        internal static bool GetIsPasswordBoxExtensionAttached(DependencyObject obj)
+        {
+            return (bool)obj.GetValue(IsPasswordBoxExtensionAttachedProperty);
+        }
+        internal static void SetIsPasswordBoxExtensionAttached(DependencyObject obj, bool value)
+        {
+            obj.SetValue(IsPasswordBoxExtensionAttachedProperty, value);
+        }
+        // Using a DependencyProperty as the backing store for IsPasswordBoxExtensionAttached.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty IsPasswordBoxExtensionAttachedProperty =
+            DependencyProperty.RegisterAttached("IsPasswordBoxExtensionAttached", typeof(bool), typeof(Extensions), new PropertyMetadata(false, OnIsPasswordBoxExtensionAttachedChanged));
+
+        private static void OnIsPasswordBoxExtensionAttachedChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctrl = d as PasswordBox;
+            var newValue = (bool)e.NewValue;
+            var oldValue = (bool)e.OldValue;
+            if (ctrl == null) return;
+
+            // 無効になった場合の処理
+            if (oldValue && !newValue)
+            {
+                ctrl.PasswordChanged -= Ctrl_PasswordChanged;
+            }
+
+            // 有効になった場合の処理
+            if (!oldValue && newValue)
+            {
+                ctrl.PasswordChanged += Ctrl_PasswordChanged;
+                var value = string.IsNullOrEmpty(ctrl.Password);
+                SetIsPasswordEmpty(ctrl, value);
+            }
+        }
+
+        private static void Ctrl_PasswordChanged(object sender, RoutedEventArgs e)
+        {
+            var ctrl = sender as PasswordBox;
+            if (ctrl != null)
+            {
+                var value = string.IsNullOrEmpty(ctrl.Password);
+                SetIsPasswordEmpty(ctrl, value);
+            }
+        }
+
+        public static bool GetIsPasswordEmpty(DependencyObject obj)
+        {
+            return (bool)obj.GetValue(IsPasswordEmptyProperty);
+        }
+        private static void SetIsPasswordEmpty(DependencyObject obj, bool value)
+        {
+            obj.SetValue(IsPasswordEmptyProperty, value);
+        }
+        // Using a DependencyProperty as the backing store for IsPasswordEmpty.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty IsPasswordEmptyProperty =
+            DependencyProperty.RegisterAttached("IsPasswordEmpty", typeof(bool), typeof(Extensions), new PropertyMetadata(true));
+
+        #endregion
+    }
 }

FluentWPF/Styles/TextBox.xaml

@@ -145,14 +145,15 @@
         <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
         <Setter Property="Padding" Value="5"/>
         <Setter Property="FontSize" Value="14"/>
+        <Setter Property="local:Extensions.IsPasswordBoxExtensionAttached" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type PasswordBox}">
                     <ControlTemplate.Resources>
                         <Storyboard x:Key="enterGotFocus">
                             <DoubleAnimation Storyboard.TargetName="TextBlock_PlaceHolder"
                                              Storyboard.TargetProperty="Opacity"
-                                             To=".0"
+                                             To=".2"
                                              Duration="0:0:0.2" />
                         </Storyboard>
                         <Storyboard x:Key="exitGotFocus">
@@ -225,7 +226,7 @@
                         </DataTrigger>
 
 
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Password, Mode=OneWay}" Value="">
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:Extensions.IsPasswordEmpty), Mode=OneWay}" Value="True">
                             <DataTrigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource exitHasText}" />
                             </DataTrigger.EnterActions>