Skip to content

Change key of ContextMenu from DefaultContextMenu to DefaultContextMenuStyle #9629

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 2 commits into from
Aug 23, 2024
Merged

Change key of ContextMenu from DefaultContextMenu to DefaultContextMenuStyle #9629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b6ac64
Change key of ContextMenu from DefaultContextMenu to DefaultContextMe…
siagupta0202 Aug 23, 2024
9f20b5a
reverting values of PasswordChar in the combined fluent dictionaries
siagupta0202 Aug 23, 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
4 changes: 2 additions & 2 deletions src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/ContextMenu.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">

<Style x:Key="DefaultContextMenu" TargetType="{x:Type ContextMenu}">
<Style x:Key="DefaultContextMenuStyle" TargetType="{x:Type ContextMenu}">
<Setter Property="TextElement.Foreground" Value="{DynamicResource ContextMenuForeground}" />
<Setter Property="Foreground" Value="{DynamicResource ContextMenuForeground}" />
<Setter Property="Background" Value="{DynamicResource ContextMenuBackground}" />
Expand Down Expand Up @@ -66,6 +66,6 @@
</Setter>
</Style>

<Style BasedOn="{StaticResource DefaultContextMenu}" TargetType="{x:Type ContextMenu}" />
<Style BasedOn="{StaticResource DefaultContextMenuStyle}" TargetType="{x:Type ContextMenu}" />

</ResourceDictionary>
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 @@ -1436,7 +1436,7 @@
</Style>
<Style BasedOn="{StaticResource DefaultComboBoxItemStyle}" TargetType="{x:Type ComboBoxItem}" />
<Style BasedOn="{StaticResource DefaultComboBoxStyle}" TargetType="{x:Type ComboBox}" />
<Style x:Key="DefaultContextMenu" TargetType="{x:Type ContextMenu}">
<Style x:Key="DefaultContextMenuStyle" TargetType="{x:Type ContextMenu}">
<Setter Property="TextElement.Foreground" Value="{DynamicResource ContextMenuForeground}" />
<Setter Property="Foreground" Value="{DynamicResource ContextMenuForeground}" />
<Setter Property="Background" Value="{DynamicResource ContextMenuBackground}" />
Expand Down Expand Up @@ -1477,7 +1477,7 @@
</Setter.Value>
</Setter>
</Style>
<Style BasedOn="{StaticResource DefaultContextMenu}" TargetType="{x:Type ContextMenu}" />
<Style BasedOn="{StaticResource DefaultContextMenuStyle}" TargetType="{x:Type ContextMenu}" />
<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
<system:Double x:Key="DefaultDataGridFontSize">14</system:Double>
<Color x:Key="DisabledControlLightColor">#FFE8EDF9</Color>
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 @@ -1408,7 +1408,7 @@
</Style>
<Style BasedOn="{StaticResource DefaultComboBoxItemStyle}" TargetType="{x:Type ComboBoxItem}" />
<Style BasedOn="{StaticResource DefaultComboBoxStyle}" TargetType="{x:Type ComboBox}" />
<Style x:Key="DefaultContextMenu" TargetType="{x:Type ContextMenu}">
<Style x:Key="DefaultContextMenuStyle" TargetType="{x:Type ContextMenu}">
<Setter Property="TextElement.Foreground" Value="{DynamicResource ContextMenuForeground}" />
<Setter Property="Foreground" Value="{DynamicResource ContextMenuForeground}" />
<Setter Property="Background" Value="{DynamicResource ContextMenuBackground}" />
Expand Down Expand Up @@ -1449,7 +1449,7 @@
</Setter.Value>
</Setter>
</Style>
<Style BasedOn="{StaticResource DefaultContextMenu}" TargetType="{x:Type ContextMenu}" />
<Style BasedOn="{StaticResource DefaultContextMenuStyle}" TargetType="{x:Type ContextMenu}" />
<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
<system:Double x:Key="DefaultDataGridFontSize">14</system:Double>
<Color x:Key="DisabledControlLightColor">#FFE8EDF9</Color>
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 @@ -1431,7 +1431,7 @@
</Style>
<Style BasedOn="{StaticResource DefaultComboBoxItemStyle}" TargetType="{x:Type ComboBoxItem}" />
<Style BasedOn="{StaticResource DefaultComboBoxStyle}" TargetType="{x:Type ComboBox}" />
<Style x:Key="DefaultContextMenu" TargetType="{x:Type ContextMenu}">
<Style x:Key="DefaultContextMenuStyle" TargetType="{x:Type ContextMenu}">
<Setter Property="TextElement.Foreground" Value="{DynamicResource ContextMenuForeground}" />
<Setter Property="Foreground" Value="{DynamicResource ContextMenuForeground}" />
<Setter Property="Background" Value="{DynamicResource ContextMenuBackground}" />
Expand Down Expand Up @@ -1472,7 +1472,7 @@
</Setter.Value>
</Setter>
</Style>
<Style BasedOn="{StaticResource DefaultContextMenu}" TargetType="{x:Type ContextMenu}" />
<Style BasedOn="{StaticResource DefaultContextMenuStyle}" TargetType="{x:Type ContextMenu}" />
<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
<system:Double x:Key="DefaultDataGridFontSize">14</system:Double>
<Color x:Key="DisabledControlLightColor">#FFE8EDF9</Color>
Expand Down