feat: (macOS) Add default property state to the Style

unoplatform · May 4, 2020 · a52d326 · a52d326
1 parent a087a21
commit a52d326
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Controls/PasswordBox/PasswordBox.cs b/src/Uno.UI/UI/Xaml/Controls/PasswordBox/PasswordBox.cs
@@ -48,10 +48,6 @@ private void RegisterSetPasswordScope()
 					_revealButton.RemoveHandler(PointerCanceledEvent, endReveal);
 					_revealButton.RemoveHandler(PointerCaptureLostEvent, endReveal);
 				});
-
-#if __MACOS__
-				IsPasswordRevealButtonEnabled = false;
-#endif
 			}
 
 			SetPasswordScope(true);

diff --git a/src/Uno.UI/UI/Xaml/Style/Generic/Generic.xaml b/src/Uno.UI/UI/Xaml/Style/Generic/Generic.xaml
@@ -4803,6 +4803,9 @@
 				Value="Hidden" />
 		<Setter Property="Padding"
 				Value="{ThemeResource TextControlThemePadding}" />
+	<!-- macOS PasswordBox implemeentation will not display the RevealButton -->
+		<macos:Setter Property="IsPasswordRevealButtonEnabled" 
+					  Value="False" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="PasswordBox">