Skip to content

Merged all the high contrast themes files into one theme file #9351

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
Jul 4, 2024
Merged

Merged all the high contrast themes files into one theme file #9351

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
aab410e
Merging all the high contrast theme files into one file
himgoyalmicro Jul 3, 2024
10a5e42
Removing unnessary comments
himgoyalmicro Jul 4, 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
8 changes: 1 addition & 7 deletions src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/ThemeManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,13 +226,7 @@ private static Uri GetFluentWindowThemeColorResourceUri(string systemTheme, bool

if(SystemParameters.HighContrast)
{
themeColorFileName = systemTheme switch
{
string s when s.Contains("hcblack") => "hcblack.xaml",
string s when s.Contains("hcwhite") => "hcwhite.xaml",
string s when s.Contains("hc1") => "hc1.xaml",
_ => "hc2.xaml"
};
themeColorFileName = "hc.xaml";
}

return new Uri("pack://application:,,,/PresentationFramework.Fluent;component/Resources/Theme/" + themeColorFileName, UriKind.Absolute);
Expand Down
47 changes: 23 additions & 24 deletions ...Framework.Fluent/Resources/Theme/HC1.xaml → ...nFramework.Fluent/Resources/Theme/HC.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,23 @@
<Color x:Key="SystemAccentColorSecondary">#4cc2ff</Color>
<Color x:Key="SystemAccentColorTertiary">#4cc2ff</Color>

<!-- Highcontrast theme: DUSK. -->
<Color x:Key="SystemColorWindowTextColor">#FFFFFF</Color>
<Color x:Key="SystemColorWindowColor">#2D3236</Color>
<Color x:Key="SystemColorHighlightTextColor">#212D3B</Color>
<Color x:Key="SystemColorHighlightColor">#ABCFF2</Color>
<Color x:Key="SystemColorButtonTextColor">#B6F6F0</Color>
<Color x:Key="SystemColorButtonFaceColor">#2D3236</Color>
<Color x:Key="SystemColorHotlightColor">#70EBDE</Color>
<Color x:Key="SystemColorGrayTextColor">#A6A6A6</Color>

<!-- Highcontrast theme -->
<DynamicResource x:Key="SystemColorWindowTextColor" ResourceKey="{x:Static SystemColors.WindowTextColorKey}" />
<DynamicResource x:Key="SystemColorWindowColor" ResourceKey="{x:Static SystemColors.WindowColorKey}" />
<DynamicResource x:Key="SystemColorHighlightTextColor" ResourceKey="{x:Static SystemColors.HighlightTextColorKey}" />
<DynamicResource x:Key="SystemColorHighlightColor" ResourceKey="{x:Static SystemColors.HighlightColorKey}" />
<DynamicResource x:Key="SystemColorButtonTextColor" ResourceKey="{x:Static SystemColors.ControlTextColorKey}" />
<DynamicResource x:Key="SystemColorButtonFaceColor" ResourceKey="{x:Static SystemColors.ControlColorKey}" />
<DynamicResource x:Key="SystemColorHotlightColor" ResourceKey="{x:Static SystemColors.HotTrackColorKey}" />
<DynamicResource x:Key="SystemColorGrayTextColor" ResourceKey="{x:Static SystemColors.GrayTextColorKey}" />

<Color x:Key="ApplicationBackgroundColor">#2D3236</Color>
<!-- Same as SystemColorWindowColor -->
<SolidColorBrush x:Key="ApplicationBackgroundBrush" Color="{StaticResource ApplicationBackgroundColor}" />
<SolidColorBrush x:Key="ApplicationBackgroundBrush" Color="{StaticResource SystemColorWindowColor}" />

<Color x:Key="KeyboardFocusBorderColor">#FFFFFF</Color>
<!-- Same as SystemColorWindowTextColor -->
<SolidColorBrush x:Key="KeyboardFocusBorderColorBrush" Color="{StaticResource KeyboardFocusBorderColor}" />
<SolidColorBrush x:Key="KeyboardFocusBorderColorBrush" Color="{StaticResource SystemColorWindowTextColor}" />

<!-- Brushes -->

Expand Down Expand Up @@ -133,18 +132,18 @@
<SolidColorBrush x:Key="SolidBackgroundFillColorQuarternaryBrush" Color="{StaticResource SystemColorWindowColor}" />
<SolidColorBrush x:Key="SolidBackgroundFillColorBaseAltBrush" Color="{StaticResource SystemColorWindowColor}" />

<SolidColorBrush x:Key="SystemFillColorSuccessBrush" Color="{StaticResource SystemFillColorSuccess}" />
<SolidColorBrush x:Key="SystemFillColorCautionBrush" Color="{StaticResource SystemFillColorCaution}" />
<SolidColorBrush x:Key="SystemFillColorCriticalBrush" Color="{StaticResource SystemFillColorCritical}" />
<SolidColorBrush x:Key="SystemFillColorNeutralBrush" Color="{StaticResource SystemFillColorNeutral}" />
<SolidColorBrush x:Key="SystemFillColorSolidNeutralBrush" Color="{StaticResource SystemFillColorSolidNeutral}" />
<SolidColorBrush x:Key="SystemFillColorAttentionBackgroundBrush" Color="{StaticResource SystemFillColorAttentionBackground}" />
<SolidColorBrush x:Key="SystemFillColorSuccessBackgroundBrush" Color="{StaticResource SystemFillColorSuccessBackground}" />
<SolidColorBrush x:Key="SystemFillColorCautionBackgroundBrush" Color="{StaticResource SystemFillColorCautionBackground}" />
<SolidColorBrush x:Key="SystemFillColorCriticalBackgroundBrush" Color="{StaticResource SystemFillColorCriticalBackground}" />
<SolidColorBrush x:Key="SystemFillColorNeutralBackgroundBrush" Color="{StaticResource SystemFillColorNeutralBackground}" />
<SolidColorBrush x:Key="SystemFillColorSolidAttentionBackgroundBrush" Color="{StaticResource SystemFillColorSolidAttentionBackground}" />
<SolidColorBrush x:Key="SystemFillColorSolidNeutralBackgroundBrush" Color="{StaticResource SystemFillColorSolidNeutralBackground}" />
<SolidColorBrush x:Key="SystemFillColorSuccessBrush" Color="{StaticResource SystemColorWindowTextColor}" />
<SolidColorBrush x:Key="SystemFillColorCautionBrush" Color="{StaticResource SystemColorWindowTextColor}" />
<SolidColorBrush x:Key="SystemFillColorCriticalBrush" Color="{StaticResource SystemColorWindowTextColor}" />
<SolidColorBrush x:Key="SystemFillColorNeutralBrush" Color="{StaticResource SystemColorWindowTextColor}" />
<SolidColorBrush x:Key="SystemFillColorSolidNeutralBrush" Color="{StaticResource SystemColorWindowTextColor}" />
<SolidColorBrush x:Key="SystemFillColorAttentionBackgroundBrush" Color="{StaticResource SystemColorWindowColor}" />
<SolidColorBrush x:Key="SystemFillColorSuccessBackgroundBrush" Color="{StaticResource SystemColorWindowColor}" />
<SolidColorBrush x:Key="SystemFillColorCautionBackgroundBrush" Color="{StaticResource SystemColorWindowColor}" />
<SolidColorBrush x:Key="SystemFillColorCriticalBackgroundBrush" Color="{StaticResource SystemColorWindowColor}" />
<SolidColorBrush x:Key="SystemFillColorNeutralBackgroundBrush" Color="{StaticResource SystemColorWindowColor}" />
<SolidColorBrush x:Key="SystemFillColorSolidAttentionBackgroundBrush" Color="{StaticResource SystemColorWindowColor}" />
<SolidColorBrush x:Key="SystemFillColorSolidNeutralBackgroundBrush" Color="{StaticResource SystemColorWindowColor}" />

<!-- Elevation border brushes -->

Expand Down
Loading