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

Jump to bottom

Fixed styles for textbox clear button #9087

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fixed styles for textbox clear button #9087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e49768e
Fixed styles for textbox clear button
anjali-wpf May 8, 2024
47d5849
Fixed styles for textbox clear button
anjali-wpf May 8, 2024
a8aed86
Merge branch 'TextboxFix' of https://github.com/anjali-wpf/wpf into T…
anjali-wpf May 22, 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
5 changes: 5 additions & 0 deletions src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/Dark.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,11 @@

<!-- ThumbRate -->
<SolidColorBrush x:Key="ThumbRateForeground" Color="{DynamicResource SystemAccentColorPrimary}" />

<!-- ClearButton -->
<SolidColorBrush x:Key="ClearButtonForegroundPressed" Color="{StaticResource TextFillColorTertiary}" />
<SolidColorBrush x:Key="ClearButtonBackgroundPressed" Color="{StaticResource SubtleFillColorTertiary}" />
<SolidColorBrush x:Key="ClearButtonBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />

<!-- TimePicker -->
<SolidColorBrush x:Key="TimePickerButtonBackground" Color="{StaticResource ControlFillColorTertiary}" />
Expand Down
5 changes: 5 additions & 0 deletions src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/HC1.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@
<SolidColorBrush x:Key="TextFillColorDisabledBrush" Color="{StaticResource SystemColorGrayTextColor}" />
<SolidColorBrush x:Key="TextPlaceholderColorBrush" Color="{StaticResource SystemColorGrayTextColor}" />
<SolidColorBrush x:Key="TextFillColorInverseBrush" Color="{StaticResource SystemColorWindowTextColor}" />

<!-- ClearButton -->
<SolidColorBrush x:Key="ClearButtonForegroundPressed" Color="{StaticResource TextFillColorTertiary}" />
<SolidColorBrush x:Key="ClearButtonBackgroundPressed" Color="{StaticResource SubtleFillColorTertiary}" />
<SolidColorBrush x:Key="ClearButtonBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />

<SolidColorBrush x:Key="AccentTextFillColorDisabledBrush" Color="{StaticResource SystemColorWindowTextColor}" />

Expand Down
5 changes: 5 additions & 0 deletions src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/HC2.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@
<SolidColorBrush x:Key="SubtleFillColorSecondaryBrush" Color="{StaticResource SystemColorButtonFaceColor}" />
<SolidColorBrush x:Key="SubtleFillColorTertiaryBrush" Color="{StaticResource SystemColorButtonFaceColor}" />
<SolidColorBrush x:Key="SubtleFillColorDisabledBrush" Color="{StaticResource SystemColorButtonFaceColor}" />

<!-- ClearButton -->
<SolidColorBrush x:Key="ClearButtonForegroundPressed" Color="{StaticResource TextFillColorTertiary}" />
<SolidColorBrush x:Key="ClearButtonBackgroundPressed" Color="{StaticResource SubtleFillColorTertiary}" />
<SolidColorBrush x:Key="ClearButtonBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />

<SolidColorBrush x:Key="ControlAltFillColorTransparentBrush" Color="Transparent" />
<SolidColorBrush x:Key="ControlAltFillColorSecondaryBrush" Color="{StaticResource SystemColorButtonFaceColor}" />
Expand Down
5 changes: 5 additions & 0 deletions ...Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/HCBlack.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@
<SolidColorBrush x:Key="TextPlaceholderColorBrush" Color="{StaticResource SystemColorGrayTextColor}" />
<SolidColorBrush x:Key="TextFillColorInverseBrush" Color="{StaticResource SystemColorWindowTextColor}" />

<!-- ClearButton -->
<SolidColorBrush x:Key="ClearButtonForegroundPressed" Color="{StaticResource TextFillColorTertiary}" />
<SolidColorBrush x:Key="ClearButtonBackgroundPressed" Color="{StaticResource SubtleFillColorTertiary}" />
<SolidColorBrush x:Key="ClearButtonBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />

<SolidColorBrush x:Key="AccentTextFillColorDisabledBrush" Color="{StaticResource SystemColorWindowTextColor}" />

<SolidColorBrush x:Key="TextOnAccentFillColorSelectedTextBrush" Color="{StaticResource SystemColorWindowTextColor}" />
Expand Down
5 changes: 5 additions & 0 deletions ...Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/HCWhite.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@
<SolidColorBrush x:Key="TextFillColorDisabledBrush" Color="{StaticResource SystemColorGrayTextColor}" />
<SolidColorBrush x:Key="TextPlaceholderColorBrush" Color="{StaticResource SystemColorGrayTextColor}" />
<SolidColorBrush x:Key="TextFillColorInverseBrush" Color="{StaticResource SystemColorWindowTextColor}" />

<!-- ClearButton -->
<SolidColorBrush x:Key="ClearButtonForegroundPressed" Color="{StaticResource TextFillColorTertiary}" />
<SolidColorBrush x:Key="ClearButtonBackgroundPressed" Color="{StaticResource SubtleFillColorTertiary}" />
<SolidColorBrush x:Key="ClearButtonBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />

<SolidColorBrush x:Key="AccentTextFillColorDisabledBrush" Color="{StaticResource SystemColorWindowTextColor}" />

Expand Down
5 changes: 5 additions & 0 deletions src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/Light.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,11 @@
<SolidColorBrush x:Key="TextOnAccentFillColorSecondaryBrush" Color="{StaticResource TextOnAccentFillColorSecondary}" />
<SolidColorBrush x:Key="TextOnAccentFillColorDisabledBrush" Color="{StaticResource TextOnAccentFillColorDisabled}" />

<!-- ClearButton -->
<SolidColorBrush x:Key="ClearButtonForegroundPressed" Color="{StaticResource TextFillColorTertiary}" />
<SolidColorBrush x:Key="ClearButtonBackgroundPressed" Color="{StaticResource SubtleFillColorTertiary}" />
<SolidColorBrush x:Key="ClearButtonBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />

<SolidColorBrush x:Key="ControlFillColorDefaultBrush" Color="{StaticResource ControlFillColorDefault}" />
<SolidColorBrush x:Key="ControlFillColorSecondaryBrush" Color="{StaticResource ControlFillColorSecondary}" />
<SolidColorBrush x:Key="ControlFillColorTertiaryBrush" Color="{StaticResource ControlFillColorTertiary}" />
Expand Down
24 changes: 18 additions & 6 deletions src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/TextBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
<Thickness x:Key="TextBoxAccentBorderThemeThickness">0,0,0,1</Thickness>
<Thickness x:Key="TextBoxLeftIconMargin">10,0,0,0</Thickness>
<Thickness x:Key="TextBoxRightIconMargin">0,0,10,0</Thickness>
<Thickness x:Key="TextBoxClearButtonMargin">0,0,4,0</Thickness>
<Thickness x:Key="TextBoxClearButtonPadding">0,0,0,0</Thickness>
<Thickness x:Key="TextBoxClearButtonMargin">0,4,4,4</Thickness>
<Thickness x:Key="TextBoxClearButtonPadding">0,0,-2,0</Thickness>
<system:Double x:Key="TextBoxIconFontSize">12</system:Double>
<system:Double x:Key="TextBoxClearButtonHeight">24</system:Double>
<system:String x:Key="ClearGlyph">&#xE894;</system:String>

Expand Down Expand Up @@ -187,9 +188,9 @@

<Button.Content>
<TextBlock
FontSize="{TemplateBinding FontSize}"
FontSize="{StaticResource TextBoxIconFontSize}"
FontFamily="{DynamicResource SegoeFluentIcons}"
>&#xE894;</TextBlock>
Text="{StaticResource ClearGlyph}" />
</Button.Content>
</Button>
</Grid>
Expand Down Expand Up @@ -223,16 +224,27 @@
<Setter TargetName="ClearButton" Property="Visibility" Value="Collapsed" />
<Setter TargetName="ClearButton" Property="Margin" Value="0" />
</Trigger>



<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsEnabled" Value="True" />
<Condition Property="IsMouseOver" Value="True" />
<Condition Property="IsFocused" Value="False" />
</MultiTrigger.Conditions>
<Setter TargetName="ClearButton" Property="Foreground" Value="{DynamicResource ClearButtonForegroundPressed}" />
<Setter TargetName="ClearButton" Property="Background" Value="{DynamicResource ClearButtonBackgroundPressed}" />
<Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundPointerOver}" />
</MultiTrigger>
<DataTrigger Binding="{Binding IsMouseOver, ElementName=ClearButton}" Value="True">
<Setter TargetName="ClearButton" Property="Background" Value="{DynamicResource ClearButtonBackgroundPointerOver}" />
</DataTrigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsEnabled" Value="True" />
<Condition Property="IsMouseOver" Value="False" />
</MultiTrigger.Conditions>
<Setter TargetName="ClearButton" Property="Background" Value="Transparent" />
</MultiTrigger>
<Trigger Property="IsReadOnly" Value="True">
<Setter TargetName="ClearButton" Property="Visibility" Value="Collapsed" />
<Setter TargetName="ClearButton" Property="Margin" Value="0" />
Expand Down
Loading