fix: PasswordBox Reveal Button to match Uno Figma File

unoplatform · Jun 1, 2022 · 9e82481 · 9e82481
1 parent 5d71ab4
commit 9e82481
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/library/Uno.Material/Generated/mergedpages.v2.xaml b/src/library/Uno.Material/Generated/mergedpages.v2.xaml
@@ -4662,7 +4662,7 @@
   <Style x:Key="MaterialNavigationViewStyle" TargetType="controls:NavigationView" BasedOn="{StaticResource MaterialBaseNavigationViewStyle}" />
   <Style x:Key="MaterialNavigationViewItemStyle" TargetType="controls:NavigationViewItem" BasedOn="{StaticResource MaterialBaseNavigationViewItemStyle}" />
   <!--origin: Styles\Controls\v2\PasswordBox.xaml-->
-  <x:String x:Key="MaterialRevealGlyphPathData">M16,5.5999984C17.699951,5.5999984 19.099976,6.9999918 19.099976,8.6999893 19.099976,10.400001 17.699951,11.799994 16,11.799994 14.299988,11.799994 12.899963,10.400001 12.899963,8.6999893 12.899963,6.9999918 14.299988,5.5999984 16,5.5999984z M16,2.1999893C12.399963,2.1999893 9.5,5.0999984 9.5,8.6999893 9.5,12.299994 12.399963,15.199988 16,15.199988 19.599976,15.199988 22.5,12.299994 22.5,8.6999893 22.5,5.0999984 19.599976,2.1999893 16,2.1999893z M16,0C24.799988,5.2249334E-08 32,8.6999893 32,8.6999893 32,8.6999893 24.799988,17.400001 16,17.400001 7.1999512,17.400001 0,8.6999893 0,8.6999893 0,8.6999893 7.1999512,5.2249334E-08 16,0z</x:String>
+  <x:String x:Key="MaterialRevealGlyphPathData">M11 0.5C6 0.5 1.73 3.61 0 8C1.73 12.39 6 15.5 11 15.5C16 15.5 20.27 12.39 22 8C20.27 3.61 16 0.5 11 0.5ZM11 13C8.24 13 6 10.76 6 8C6 5.24 8.24 3 11 3C13.76 3 16 5.24 16 8C16 10.76 13.76 13 11 13ZM11 5C9.34 5 8 6.34 8 8C8 9.66 9.34 11 11 11C12.66 11 14 9.66 14 8C14 6.34 12.66 5 11 5Z</x:String>
   <SolidColorBrush x:Key="MaterialDisabledOutlinedPasswordBoxBorderBrush" Opacity="0.12" Color="{ThemeResource OnSurfaceColor}" />
   <Style x:Key="MaterialRevealButtonStyle" TargetType="Button">
     <Setter Property="Template">
@@ -4681,7 +4681,7 @@
                 </VisualState>
               </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
-            <Path x:Name="GlyphElement" Width="18" HorizontalAlignment="Center" VerticalAlignment="Center" ios:Margin="0,2,0,0" AutomationProperties.AccessibilityView="Raw" Data="{StaticResource MaterialRevealGlyphPathData}" Fill="{StaticResource OnSurfaceVariantBrush}" Stretch="Uniform" />
+            <Path x:Name="GlyphElement" Width="20" HorizontalAlignment="Center" VerticalAlignment="Center" ios:Margin="0,2,0,0" AutomationProperties.AccessibilityView="Raw" Data="{StaticResource MaterialRevealGlyphPathData}" Fill="{StaticResource OnSurfaceVariantBrush}" Stretch="Uniform" />
           </Grid>
         </ControlTemplate>
       </Setter.Value>

diff --git a/src/library/Uno.Material/Styles/Controls/v2/PasswordBox.xaml b/src/library/Uno.Material/Styles/Controls/v2/PasswordBox.xaml
@@ -7,7 +7,7 @@
                     xmlns:um="using:Uno.Material"
                     mc:Ignorable="ios macos">
 
-    <x:String x:Key="MaterialRevealGlyphPathData">M16,5.5999984C17.699951,5.5999984 19.099976,6.9999918 19.099976,8.6999893 19.099976,10.400001 17.699951,11.799994 16,11.799994 14.299988,11.799994 12.899963,10.400001 12.899963,8.6999893 12.899963,6.9999918 14.299988,5.5999984 16,5.5999984z M16,2.1999893C12.399963,2.1999893 9.5,5.0999984 9.5,8.6999893 9.5,12.299994 12.399963,15.199988 16,15.199988 19.599976,15.199988 22.5,12.299994 22.5,8.6999893 22.5,5.0999984 19.599976,2.1999893 16,2.1999893z M16,0C24.799988,5.2249334E-08 32,8.6999893 32,8.6999893 32,8.6999893 24.799988,17.400001 16,17.400001 7.1999512,17.400001 0,8.6999893 0,8.6999893 0,8.6999893 7.1999512,5.2249334E-08 16,0z</x:String>
+	<x:String x:Key="MaterialRevealGlyphPathData">M11 0.5C6 0.5 1.73 3.61 0 8C1.73 12.39 6 15.5 11 15.5C16 15.5 20.27 12.39 22 8C20.27 3.61 16 0.5 11 0.5ZM11 13C8.24 13 6 10.76 6 8C6 5.24 8.24 3 11 3C13.76 3 16 5.24 16 8C16 10.76 13.76 13 11 13ZM11 5C9.34 5 8 6.34 8 8C8 9.66 9.34 11 11 11C12.66 11 14 9.66 14 8C14 6.34 12.66 5 11 5Z</x:String>
 
     <SolidColorBrush x:Key="MaterialDisabledOutlinedPasswordBoxBorderBrush"
                      Opacity="0.12"
@@ -36,7 +36,7 @@
                         </VisualStateManager.VisualStateGroups>
 
                         <Path x:Name="GlyphElement"
-                              Width="18"
+                              Width="20"
                               HorizontalAlignment="Center"
                               VerticalAlignment="Center"
                               ios:Margin="0,2,0,0"