Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: MaterialOutlinedPasswordBox content shift #1497

Merged
merged 5 commits into from
Oct 31, 2024
Merged

fix: MaterialOutlinedPasswordBox content shift #1497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ee096dc
fix: MaterialOutlinedPasswordBox content shift
Kunal22shah Oct 29, 2024
94e694e
chore: updating markup and docs
Kunal22shah Oct 30, 2024
87dbbf0
chore: Merge branch 'master' into dev/ks/outline-passwordbox-template…
Kunal22shah Oct 31, 2024
bcf0c10
chore: updating migration docs
Kunal22shah Oct 31, 2024
c03d69e
chore: resolving PR comments
Kunal22shah Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 17 additions & 14 deletions doc/material-migration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,23 @@ We have standardized the naming of styles and resource keys. This change aims to

agneszitte marked this conversation as resolved.
Show resolved Hide resolved
#### Changes to Resource Keys

| Old Resource Key | New Resource Key |
| ---- | ---- |
| MaterialTextBoxClearGlyphWidth | TextBoxClearGlyphWidth |
| MaterialTextBoxClearGlyphHeight | TextBoxClearGlyphHeight |
| MaterialFilledTextBoxCornerRadius | FilledTextBoxCornerRadius |
| MaterialFilledTextBoxPadding | FilledTextBoxPadding |
| MaterialFilledTextBoxMinHeight | FilledTextBoxMinHeight |
| MaterialFilledTextBoxBorderHeightFocused | FilledTextBoxBorderHeightFocused |
| MaterialOutlinedTextBoxBorderThickness | OutlinedTextBoxBorderThickness |
| MaterialOutlinedTextBoxCornerRadius | OutlinedTextBoxCornerRadius |
| MaterialOutlinedTextBoxPadding | OutlinedTextBoxPadding |
| MaterialOutlinedTextBoxMinHeight | OutlinedTextBoxMinHeight |
| MaterialOutlinedTextBoxBorderThicknessFocused | OutlinedTextBoxBorderThicknessFocused |
| MaterialOutlinedTextBoxBorderThicknessPointerOver | OutlinedTextBoxBorderThicknessPointerOver |
| Old Resource Key | New Resource Key |
|---------------------------------------------------|-------------------------------------------------|
| MaterialTextBoxClearGlyphWidth | TextBoxClearGlyphWidth |
| MaterialTextBoxClearGlyphHeight | TextBoxClearGlyphHeight |
| MaterialFilledTextBoxCornerRadius | FilledTextBoxCornerRadius |
| MaterialFilledTextBoxPadding | FilledTextBoxPadding |
| MaterialFilledTextBoxMinHeight | FilledTextBoxMinHeight |
| MaterialFilledTextBoxBorderHeightFocused | FilledTextBoxBorderHeightFocused |
| MaterialOutlinedTextBoxBorderThickness | OutlinedTextBoxBorderThickness |
| MaterialOutlinedTextBoxCornerRadius | OutlinedTextBoxCornerRadius |
| MaterialOutlinedTextBoxPadding | OutlinedTextBoxPadding |
| MaterialOutlinedTextBoxMinHeight | OutlinedTextBoxMinHeight |
| MaterialOutlinedTextBoxBorderThicknessFocused | OutlinedTextBoxBorderThicknessFocused |
| MaterialOutlinedTextBoxBorderThicknessPointerOver | OutlinedTextBoxBorderThicknessPointerOver |
| OutlinedPasswordBoxBorderPadding | ***REMOVED*** |
| OutlinedPasswordBoxBorderPaddingPointerOver | ***REMOVED*** |
| OutlinedPasswordBoxBorderPaddingFocused | ***REMOVED*** |
agneszitte marked this conversation as resolved.
Show resolved Hide resolved

### Upgrading to Uno Themes 5.1

Expand Down
5 changes: 1 addition & 4 deletions doc/styles/PasswordBox.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,7 @@ IsDefaultStyle\*: Styles in this column will be set as the default implicit styl
| `OutlinedPasswordBoxCharacterSpacing` | `Int32` | `BodyLargeCharacterSpacing` |
| `OutlinedPasswordBoxCornerRadius` | `CornerRadius` | 4 |
| `OutlinedPasswordBoxMinHeight` | `Double` | 58 |
| `OutlinedPasswordBoxBorderPadding` | `Thickness` | 1 |
| `OutlinedPasswordBoxBorderPaddingPointerOver` | `Thickness` | 0 |
| `OutlinedPasswordBoxBorderPaddingFocused` | `Thickness` | 0 |
| `OutlinedPasswordBoxPadding` | `Thickness` | 16,4,8,4 |
| `OutlinedPasswordBoxBorderThickness` | `Thickness` | 1 |
| `OutlinedPasswordBoxBorderThicknessPointerOver` | `Thickness` | 2 |
| `OutlinedPasswordBoxBorderThicknessPointerOver` | `Thickness` | 1 |
| `OutlinedPasswordBoxBorderThicknessFocused` | `Thickness` | 2 |
41 changes: 21 additions & 20 deletions src/library/Uno.Material/Styles/Controls/v2/PasswordBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,10 @@

<CornerRadius x:Key="OutlinedPasswordBoxCornerRadius">4</CornerRadius>
<x:Double x:Key="OutlinedPasswordBoxMinHeight">58</x:Double>
<Thickness x:Key="OutlinedPasswordBoxBorderPadding">1</Thickness>
<Thickness x:Key="OutlinedPasswordBoxBorderThickness">1</Thickness>
<Thickness x:Key="OutlinedPasswordBoxPadding">16,4,8,4</Thickness>
<Thickness x:Key="OutlinedPasswordBoxBorderThicknessPointerOver">1</Thickness>
<Thickness x:Key="OutlinedPasswordBoxBorderPaddingPointerOver">1</Thickness>
<Thickness x:Key="OutlinedPasswordBoxBorderThicknessFocused">2</Thickness>
<Thickness x:Key="OutlinedPasswordBoxBorderPaddingFocused">1</Thickness>

<CornerRadius x:Key="FilledPasswordBoxCornerRadius">4,4,0,0</CornerRadius>
<x:Double x:Key="FilledPasswordBoxMinHeight">56</x:Double>
Expand Down Expand Up @@ -183,13 +180,10 @@

<CornerRadius x:Key="OutlinedPasswordBoxCornerRadius">4</CornerRadius>
<x:Double x:Key="OutlinedPasswordBoxMinHeight">58</x:Double>
<Thickness x:Key="OutlinedPasswordBoxBorderPadding">1</Thickness>
<Thickness x:Key="OutlinedPasswordBoxBorderThickness">1</Thickness>
<Thickness x:Key="OutlinedPasswordBoxPadding">16,4,8,4</Thickness>
<Thickness x:Key="OutlinedPasswordBoxBorderThicknessPointerOver">1</Thickness>
<Thickness x:Key="OutlinedPasswordBoxBorderPaddingPointerOver">1</Thickness>
<Thickness x:Key="OutlinedPasswordBoxBorderThicknessFocused">2</Thickness>
<Thickness x:Key="OutlinedPasswordBoxBorderPaddingFocused">1</Thickness>

<CornerRadius x:Key="FilledPasswordBoxCornerRadius">4,4,0,0</CornerRadius>
<x:Double x:Key="FilledPasswordBoxMinHeight">56</x:Double>
Expand Down Expand Up @@ -471,49 +465,42 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="PasswordBox">
<Border x:Name="RootBorder"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}"
Padding="{ThemeResource OutlinedPasswordBoxBorderPadding}">
Kunal22shah marked this conversation as resolved.
Show resolved Hide resolved

<Grid>
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal" />

<VisualState x:Name="PointerOver">
<VisualState.Setters>
<Setter Target="RootBorder.BorderBrush" Value="{ThemeResource OutlinedPasswordBoxBorderBrushPointerOver}" />
<Setter Target="ContentElement.Foreground" Value="{ThemeResource OutlinedPasswordBoxForegroundPointerOver}" />
<Setter Target="PlaceholderElement.Foreground" Value="{ThemeResource OutlinedPasswordBoxPlaceholderForegroundPointerOver}" />
<Setter Target="Root.Background" Value="{ThemeResource OutlinedPasswordBoxBackgroundPointerOver}" />
<Setter Target="RootBorder.BorderThickness" Value="{ThemeResource OutlinedPasswordBoxBorderThicknessPointerOver}" />
<Setter Target="RootBorder.Padding" Value="{ThemeResource OutlinedPasswordBoxBorderPaddingPointerOver}" />
<Setter Target="BorderBorder.BorderThickness" Value="{ThemeResource OutlinedPasswordBoxBorderThicknessPointerOver}" />
<Setter Target="BorderBorder.BorderBrush" Value="{ThemeResource OutlinedPasswordBoxBorderBrushPointerOver}" />
</VisualState.Setters>
</VisualState>

<VisualState x:Name="Pressed" />

<VisualState x:Name="Disabled">
<VisualState.Setters>
<Setter Target="RootBorder.BorderBrush" Value="{ThemeResource OutlinedPasswordBoxBorderBrushDisabled}" />
<!-- In this case the opacity is not applied to the brush directly - known issue for ContentElement -->
<Setter Target="ContentElement.Foreground" Value="{ThemeResource OutlinedPasswordBoxForegroundDisabled}" />
<Setter Target="ContentElement.Opacity" Value="{ThemeResource OutlinedPasswordBoxForegroundOpacityDisabled}" />
<Setter Target="PlaceholderElement.Foreground" Value="{ThemeResource OutlinedPasswordBoxPlaceholderForegroundDisabled}" />
<Setter Target="Root.Background" Value="{ThemeResource OutlinedPasswordBoxBackgroundDisabled}" />
<Setter Target="IconPresenter.Foreground" Value="{ThemeResource PasswordBoxLeadingIconForegroundDisabled}" />
<Setter Target="BorderBorder.BorderBrush" Value="{ThemeResource OutlinedPasswordBoxBorderBrushDisabled}" />
</VisualState.Setters>
</VisualState>

<VisualState x:Name="Focused">
<VisualState.Setters>
<Setter Target="RootBorder.BorderBrush" Value="{ThemeResource OutlinedPasswordBoxBorderBrushFocused}" />
<Setter Target="ContentElement.Foreground" Value="{ThemeResource OutlinedPasswordBoxForegroundFocused}" />
<Setter Target="PlaceholderElement.Foreground" Value="{ThemeResource OutlinedPasswordBoxPlaceholderForegroundFocused}" />
<Setter Target="Root.Background" Value="{ThemeResource OutlinedPasswordBoxBackgroundFocused}" />
<Setter Target="RootBorder.BorderThickness" Value="{ThemeResource OutlinedPasswordBoxBorderThicknessFocused}" />
<Setter Target="RootBorder.Padding" Value="{ThemeResource OutlinedPasswordBoxBorderPaddingFocused}" />
<Setter Target="BorderBorder.BorderThickness" Value="{ThemeResource OutlinedPasswordBoxBorderThicknessFocused}" />
<Setter Target="BorderBorder.BorderBrush" Value="{ThemeResource OutlinedPasswordBoxBorderBrushFocused}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
Expand Down Expand Up @@ -568,6 +555,7 @@
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>

<!-- Content Grid -->
<Grid x:Name="Root"
Padding="{TemplateBinding Padding}"
Background="{TemplateBinding Background}">
Expand All @@ -577,7 +565,9 @@
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>

<!-- IconPresenter -->
<ContentPresenter x:Name="IconPresenter"
Grid.Column="0"
MinWidth="25"
MaxWidth="34"
MaxHeight="34"
Expand All @@ -588,6 +578,7 @@
Content="{Binding Path=(ut:ControlExtensions.Icon), RelativeSource={RelativeSource TemplatedParent}}"
Visibility="{Binding Path=(ut:ControlExtensions.Icon), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource NullToCollapsedConverter}, FallbackValue=Collapsed, TargetNullValue=Collapsed}" />

<!-- ContentElement -->
<ScrollViewer x:Name="ContentElement"
Grid.Column="1"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Expand All @@ -606,6 +597,7 @@
</ScrollViewer.RenderTransform>
</ScrollViewer>

<!-- PlaceholderElement -->
<TextBlock x:Name="PlaceholderElement"
Grid.Column="1"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
Expand All @@ -619,6 +611,7 @@
</TextBlock.RenderTransform>
</TextBlock>

<!-- RevealButton -->
<Button x:Name="RevealButton"
Grid.Column="2"
MinWidth="34"
Expand All @@ -629,7 +622,15 @@
Style="{StaticResource MaterialRevealButtonStyle}"
Visibility="Collapsed" />
</Grid>
</Border>
<!--
In Figma design, border thickness doesn't push its inner content like on xaml.
So we are putting the border as an overlay here. To keep the rest of the measurements/values identical to Figma.
-->
<Border x:Name="BorderBorder"
Kunal22shah marked this conversation as resolved.
Show resolved Hide resolved
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}" />
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
Expand Down
12 changes: 0 additions & 12 deletions src/library/Uno.Themes.WinUI.Markup/Theme/PasswordBox.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,18 +155,6 @@ public static partial class BorderBrush
public static ThemeResourceKey<Brush> Focused => new("OutlinedPasswordBoxBorderBrushFocused");
}

public static partial class BorderPadding
{
[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxBorderPadding")]
public static ThemeResourceKey<Thickness> Default => new("OutlinedPasswordBoxBorderPadding");

[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxBorderPaddingPointerOver")]
public static ThemeResourceKey<Thickness> PointerOver => new("OutlinedPasswordBoxBorderPaddingPointerOver");

[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxBorderPaddingFocused")]
public static ThemeResourceKey<Thickness> Focused => new("OutlinedPasswordBoxBorderPaddingFocused");
}

public static partial class BorderThickness
{
[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxBorderThickness")]
Expand Down
Loading