-
-
Notifications
You must be signed in to change notification settings - Fork 97
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #144 from wokhan/imp_themes_accessibility
Improved theming and accessibility
- Loading branch information
Showing
38 changed files
with
1,031 additions
and
785 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:system="clr-namespace:System;assembly=System.Runtime"> | ||
|
|
||
| <ResourceDictionary.MergedDictionaries> | ||
| <ResourceDictionary Source="../Theme.xaml" /> | ||
| </ResourceDictionary.MergedDictionaries> | ||
|
|
||
| <SolidColorBrush x:Key="AccentColorBrush" Color="Coral" /> | ||
| <SolidColorBrush x:Key="DataGridCellSelectedForeground" Color="Black" /> | ||
| <SolidColorBrush x:Key="DataGridRowSelectedBackground" Color="SlateGray" /> | ||
| <SolidColorBrush x:Key="DataGridRowAltBackground" Color="#101010" /> | ||
|
|
||
| <SolidColorBrush x:Key="TabItemOverBackground" Color="#202020" /> | ||
|
|
||
| <SolidColorBrush x:Key="ButtonBackground" Color="#303030" /> | ||
| <SolidColorBrush x:Key="ButtonOverBackground" Color="#505050" /> | ||
|
|
||
| <SolidColorBrush x:Key="StatusScreenPrivateBackgroundBrush" Color="DarkMagenta" Opacity="0.2" /> | ||
| <SolidColorBrush x:Key="StatusScreenPublicBackgroundBrush" Color="DarkGreen" Opacity="0.2" /> | ||
| <SolidColorBrush x:Key="StatusScreenDomainBackgroundBrush" Color="DarkBlue" Opacity="0.2" /> | ||
| <SolidColorBrush x:Key="StatusScreenAllBackgroundBrush" Color="Gray" Opacity="0.2" /> | ||
|
|
||
| <system:Double x:Key="{x:Static SystemParameters.CaptionHeightKey}">38</system:Double> | ||
|
|
||
| <SolidColorBrush x:Key="{x:Static SystemColors.WindowBrushKey}" Color="Black" /> | ||
| <SolidColorBrush x:Key="{x:Static SystemColors.WindowTextBrushKey}" Color="White" /> | ||
| <SolidColorBrush x:Key="{x:Static SystemColors.ActiveCaptionBrushKey}" Color="#202020" /> | ||
| <SolidColorBrush x:Key="{x:Static SystemColors.ScrollBarBrushKey}" Color="#202020" /> | ||
| <SolidColorBrush x:Key="{x:Static SystemColors.MenuBarBrushKey}" Color="#101010" /> | ||
| <SolidColorBrush x:Key="{x:Static SystemColors.ControlTextBrushKey}" Color="White" /> | ||
| <SolidColorBrush x:Key="{x:Static SystemColors.ControlBrushKey}" Color="#202020" /> | ||
| <SolidColorBrush x:Key="{x:Static SystemColors.InfoBrushKey}" Color="Gray" /> | ||
| <SolidColorBrush x:Key="{x:Static SystemColors.InfoTextBrushKey}" Color="Black" /> | ||
| <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Gray" /> | ||
| <!--<SolidColorBrush x:Key="{x:Static SystemColors.ButtonHighlightBrushKey}" Color="#202020" />--> | ||
|
|
||
| <SolidColorBrush x:Key="{x:Static SystemColors.ControlLightBrushKey}" Color="Black" /> | ||
|
|
||
| </ResourceDictionary> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:system="clr-namespace:System;assembly=mscorlib"> | ||
|
|
||
| <ResourceDictionary.MergedDictionaries> | ||
| <ResourceDictionary Source="../Theme.xaml" /> | ||
| </ResourceDictionary.MergedDictionaries> | ||
|
|
||
| <SolidColorBrush x:Key="AccentColorBrush" Color="Coral" /> | ||
| <SolidColorBrush x:Key="DataGridCellSelectedForeground" Color="Black" /> | ||
| <SolidColorBrush x:Key="DataGridRowSelectedBackground" Color="LightBlue" /> | ||
| <SolidColorBrush x:Key="DataGridRowAltBackground" Color="LightGray" /> | ||
|
|
||
| <SolidColorBrush x:Key="TabItemOverBackground" Color="WhiteSmoke" /> | ||
|
|
||
| <SolidColorBrush x:Key="ButtonBackground" Color="WhiteSmoke" /> | ||
| <SolidColorBrush x:Key="ButtonOverBackground" Color="LightBlue" /> | ||
|
|
||
| <SolidColorBrush x:Key="StatusScreenPrivateBackgroundBrush" Color="Lavender" /> | ||
| <SolidColorBrush x:Key="StatusScreenPublicBackgroundBrush" Color="#FFC5FFC5" /> | ||
| <SolidColorBrush x:Key="StatusScreenDomainBackgroundBrush" Color="#FFC1F4FF" /> | ||
| <SolidColorBrush x:Key="StatusScreenAllBackgroundBrush" Color="LightGray" /> | ||
|
|
||
| <system:Double x:Key="{x:Static SystemParameters.CaptionHeightKey}">38</system:Double> | ||
|
|
||
| <SolidColorBrush x:Key="{x:Static SystemColors.WindowBrushKey}" Color="WhiteSmoke" /> | ||
| <SolidColorBrush x:Key="{x:Static SystemColors.WindowTextBrushKey}" Color="Black" /> | ||
| <SolidColorBrush x:Key="{x:Static SystemColors.ActiveCaptionBrushKey}" Color="LightGray" /> | ||
| <SolidColorBrush x:Key="{x:Static SystemColors.ScrollBarBrushKey}" Color="WhiteSmoke" /> | ||
| <SolidColorBrush x:Key="{x:Static SystemColors.MenuBarBrushKey}" Color="LightGray" /> | ||
| <SolidColorBrush x:Key="{x:Static SystemColors.ControlTextBrushKey}" Color="Black" /> | ||
| <SolidColorBrush x:Key="{x:Static SystemColors.ControlBrushKey}" Color="White" /> | ||
| <SolidColorBrush x:Key="{x:Static SystemColors.InfoBrushKey}" Color="LightYellow" /> | ||
| <SolidColorBrush x:Key="{x:Static SystemColors.InfoTextBrushKey}" Color="Black" /> | ||
| <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Gray" /> | ||
| <!--<SolidColorBrush x:Key="{x:Static SystemColors.ButtonHighlightBrushKey}" Color="#202020" />--> | ||
|
|
||
| <SolidColorBrush x:Key="{x:Static SystemColors.ControlLightBrushKey}" Color="Black" /> | ||
|
|
||
| </ResourceDictionary> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:system="clr-namespace:System;assembly=System.Runtime"> | ||
|
|
||
| <ResourceDictionary.MergedDictionaries> | ||
| <ResourceDictionary Source="../Theme.xaml" /> | ||
| </ResourceDictionary.MergedDictionaries> | ||
|
|
||
| <SolidColorBrush x:Key="AccentColorBrush" Color="{x:Static SystemParameters.WindowGlassColor}" /> | ||
|
|
||
| <SolidColorBrush x:Key="DataGridCellSelectedForeground" Color="Black" /> | ||
| <SolidColorBrush x:Key="DataGridRowSelectedBackground" Color="LightBlue" /> | ||
|
|
||
| <SolidColorBrush x:Key="TabItemOverBackground" Color="{x:Static SystemColors.ControlColor}" /> | ||
|
|
||
| <SolidColorBrush x:Key="ButtonBackground" Color="{x:Static SystemColors.ControlDarkColor}" /> | ||
| <SolidColorBrush x:Key="ButtonOverBackground" Color="{x:Static SystemColors.ControlLightColor}" /> | ||
|
|
||
| <system:Double x:Key="{x:Static SystemParameters.CaptionHeightKey}">38</system:Double> | ||
|
|
||
| <SolidColorBrush x:Key="StatusScreenPrivateBackgroundBrush" Color="{x:Static SystemColors.ControlColor}" /> | ||
| <SolidColorBrush x:Key="StatusScreenPublicBackgroundBrush" Color="{x:Static SystemColors.ControlColor}" /> | ||
| <SolidColorBrush x:Key="StatusScreenDomainBackgroundBrush" Color="{x:Static SystemColors.ControlColor}" /> | ||
| <SolidColorBrush x:Key="StatusScreenAllBackgroundBrush" Color="{x:Static SystemColors.ControlColor}" /> | ||
|
|
||
| </ResourceDictionary> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| using Microsoft.Win32; | ||
|
|
||
| using System; | ||
| using System.Linq; | ||
| using System.Windows; | ||
| using System.Windows.Controls.Primitives; | ||
|
|
||
| using Wokhan.WindowsFirewallNotifier.Common.Config; | ||
|
|
||
| namespace Wokhan.WindowsFirewallNotifier.Common.UI.Themes | ||
| { | ||
| public static partial class ThemeHelper | ||
| { | ||
| public static string GetActiveTheme() | ||
| { | ||
| if (Settings.Default.Theme is null or "Automatic") | ||
| { | ||
| if (SystemParameters.HighContrast) | ||
| { | ||
| return "System"; | ||
| } | ||
|
|
||
| using (RegistryKey? key = Registry.CurrentUser.OpenSubKey("Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize")) | ||
| { | ||
| return (int?)key?.GetValue("AppsUseLightTheme") == 0 ? "Dark" : "Light"; | ||
| } | ||
| } | ||
| else | ||
| { | ||
| return Settings.Default.Theme; | ||
| } | ||
| } | ||
|
|
||
| public static string GetURIForCurrentTheme() | ||
| { | ||
| return $"pack://application:,,,/Wokhan.WindowsFirewallNotifier.Common;component/UI/Themes/{GetActiveTheme()}.xaml"; | ||
| } | ||
|
|
||
| public static string GetURIForTheme(string themeName) | ||
| { | ||
| if (themeName == "Automatic") | ||
| { | ||
| return GetURIForCurrentTheme(); | ||
| } | ||
|
|
||
| return $"pack://application:,,,/Wokhan.WindowsFirewallNotifier.Common;component/UI/Themes/{themeName}.xaml"; | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.