8000 Fix(Fluent): TextBox invalidation style by harshit7962 · Pull Request #10887 · dotnet/wpf · GitHub
[go: up one dir, main page]
Skip to content

Fix(Fluent): TextBox invalidation style #10887

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

Merged
merged 3 commits into from
May 30, 2025
Merged

Fix(Fluent): TextBox invalidation style #10887

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a570de4
Fix TextBox invalidation style
harshit7962 May 27, 2025
59028ef
Update Common theme files
harshit7962 May 27, 2025
e6b5254
Update resource name
harshit7962 May 30, 2025
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
Prev Previous commit
Update resource name
  • Loading branch information
@harshit7962
harshit7962 committed May 30, 2025
commit e6b5254db79f96050d852e19ebc5f4f5f1cbb469
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Variables.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<Thickness x:Key="DatePickerHostPadding">0,1,0,2</Thickness>
<Thickness x:Key="DatePickerHostMonthPadding">9,0,0,1</Thickness>
<Thickness x:Key="ComboBoxEditableTextPadding">10,0,30,0</Thickness>
<Thickness x:Key="ErrorTemplateBorderPadding">1</Thickness>
<Thickness x:Key="TextControlErrorBorderPadding">1</Thickness>

<system:Double x:Key="ComboBoxMinHeight">24</system:Double>
<!-- <Thickness x:Key="ComboBoxPadding">12,1,0,3</Thickness> -->
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -238,7 +238,7 @@
BorderBrush="{DynamicResource SystemFillColorCriticalBrush}"
BorderThickness="{DynamicResource TextControlBorderThemeThickness}"
CornerRadius="{DynamicResource ControlCornerRadius}"
Padding="{StaticResource ErrorTemplateBorderPadding}">
Padding="{StaticResource TextControlErrorBorderPadding}">
<AdornedElementPlaceholder />
</Border>
</ControlTemplate>
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Dark.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<Thickness x:Key="DatePickerHostPadding">0,1,0,2</Thickness>
<Thickness x:Key="DatePickerHostMonthPadding">9,0,0,1</Thickness>
<Thickness x:Key="ComboBoxEditableTextPadding">10,0,30,0</Thickness>
<Thickness x:Key="ErrorTemplateBorderPadding">1</Thickness>
<Thickness x:Key="TextControlErrorBorderPadding">1</Thickness>
<system:Double x:Key="ComboBoxMinHeight">24</system:Double>
<!-- <Thickness x:Key="ComboBoxPadding">12,1,0,3</Thickness> -->
<system:Double x:Key="NavigationViewItemOnLeftMinHeight">32</system:Double>
Expand Down Expand Up @@ -4961,7 +4961,7 @@
</ControlTemplate.Triggers>
</ControlTemplate>
<ControlTemplate x:Key="DefaultTextBoxInvalidationStyle">
<Border BorderBrush="{DynamicResource SystemFillColorCriticalBrush}" BorderThickness="{DynamicResource TextControlBorderThemeThickness}" CornerRadius="{DynamicResource ControlCornerRadius}" Padding="{StaticResource ErrorTemplateBorderPadding}">
<Border BorderBrush="{DynamicResource SystemFillColorCriticalBrush}" BorderThickness="{DynamicResource TextControlBorderThemeThickness}" CornerRadius="{DynamicResource ControlCornerRadius}" Padding="{StaticResource TextControlErrorBorderPadding}">
<AdornedElementPlaceholder />
</Border>
</ControlTemplate>
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.HC.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<Thickness x:Key="DatePickerHostPadding">0,1,0,2</Thickness>
<Thickness x:Key="DatePickerHostMonthPadding">9,0,0,1</Thickness>
<Thickness x:Key="ComboBoxEditableTextPadding">10,0,30,0</Thickness>
<Thickness x:Key="ErrorTemplateBorderPadding">1</Thickness>
<Thickness x:Key="TextControlErrorBorderPadding">1</Thickness>
<system:Double x:Key="ComboBoxMinHeight">24</system:Double>
<!-- <Thickness x:Key="ComboBoxPadding">12,1,0,3</Thickness> -->
<system:Double x:Key="NavigationViewItemOnLeftMinHeight">32</system:Double>
Expand Down Expand Up @@ -4874,7 +4874,7 @@
</ControlTemplate.Triggers>
</ControlTemplate>
<ControlTemplate x:Key="DefaultTextBoxInvalidationStyle">
<Border BorderBrush="{DynamicResource SystemFillColorCriticalBrush}" BorderThickness="{DynamicResource TextControlBorderThemeThickness}" CornerRadius="{DynamicResource ControlCornerRadius}" Padding="{StaticResource ErrorTemplateBorderPadding}">
<Border BorderBrush="{DynamicResource SystemFillColorCriticalBrush}" BorderThickness="{DynamicResource TextControlBorderThemeThickness}" CornerRadius="{DynamicResource ControlCornerRadius}" Padding="{StaticResource TextControlErrorBorderPadding}">
<AdornedElementPlaceholder />
</Border>
</ControlTemplate>
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Light.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<Thickness x:Key="DatePickerHostPadding">0,1,0,2</Thickness>
<Thickness x:Key="DatePickerHostMonthPadding">9,0,0,1</Thickness>
<Thickness x:Key="ComboBoxEditableTextPadding">10,0,30,0</Thickness>
<Thickness x:Key="ErrorTemplateBorderPadding">1</Thickness>
<Thickness x:Key="TextControlErrorBorderPadding">1</Thickness>
<system:Double x:Key="ComboBoxMinHeight">24</system:Double>
<!-- <Thickness x:Key="ComboBoxPadding">12,1,0,3</Thickness> -->
<system:Double x:Key="NavigationViewItemOnLeftMinHeight">32</system:Double>
Expand Down Expand Up @@ -4970,7 +4970,7 @@
</ControlTemplate.Triggers>
</ControlTemplate>
<ControlTemplate x:Key="DefaultTextBoxInvalidationStyle">
<Border BorderBrush="{DynamicResource SystemFillColorCriticalBrush}" BorderThickness="{DynamicResource TextControlBorderThemeThickness}" CornerRadius="{DynamicResource ControlCornerRadius}" Padding="{StaticResource ErrorTemplateBorderPadding}">
<Border BorderBrush="{DynamicResource SystemFillColorCriticalBrush}" BorderThickness="{DynamicResource TextControlBorderThemeThickness}" CornerRadius="{DynamicResource ControlCornerRadius}" Padding="{StaticResource TextControlErrorBorderPadding}">
<AdornedElementPlaceholder />
</Border>
</ControlTemplate>
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<Thickness x:Key="DatePickerHostPadding">0,1,0,2</Thickness>
<Thickness x:Key="DatePickerHostMonthPadding">9,0,0,1</Thickness>
<Thickness x:Key="ComboBoxEditableTextPadding">10,0,30,0</Thickness>
<Thickness x:Key="ErrorTemplateBorderPadding">1</Thickness>
<Thickness x:Key="TextControlErrorBorderPadding">1</Thickness>
<system:Double x:Key="ComboBoxMinHeight">24</system:Double>
<!-- <Thickness x:Key="ComboBoxPadding">12,1,0,3</Thickness> -->
<system:Double x:Key="NavigationViewItemOnLeftMinHeight">32</system:Double>
Expand Down Expand Up @@ -4220,7 +4220,7 @@
</ControlTemplate.Triggers>
</ControlTemplate>
<ControlTemplate x:Key="DefaultTextBoxInvalidationStyle">
<Border BorderBrush="{DynamicResource SystemFillColorCriticalBrush}" BorderThickness="{DynamicResource TextControlBorderThemeThickness}" CornerRadius="{DynamicResource ControlCornerRadius}" Padding="{StaticResource ErrorTemplateBorderPadding}">
<Border BorderBrush="{DynamicResource SystemFillColorCriticalBrush}" BorderThickness="{DynamicResource TextControlBorderThemeThickness}" CornerRadius="{DynamicResource ControlCornerRadius}" Padding="{StaticResource TextControlErrorBorderPadding}">
<AdornedElementPlaceholder />
</Border>
</ControlTemplate>
Expand Down
0