Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-15 19:27:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Settings]Fix IsEnabledTextBlock secondary style (#27928)

Browse Source
This commit is contained in:
Jaime Bernardo
2023-08-11 08:54:31 +01:00
committed by GitHub
parent aedac403b4
commit 24dfec624e
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/settings-ui/Settings.UI/SettingsXAML/App.xaml
View File

@@ -11,7 +11,6 @@
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" /> <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
<ResourceDictionary Source="/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml" /> <ResourceDictionary Source="/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml" />
<ResourceDictionary Source="/SettingsXAML/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml" />
<ResourceDictionary Source="/SettingsXAML/Styles/TextBlock.xaml" /> <ResourceDictionary Source="/SettingsXAML/Styles/TextBlock.xaml" />
<ResourceDictionary Source="/SettingsXAML/Styles/Button.xaml" /> <ResourceDictionary Source="/SettingsXAML/Styles/Button.xaml" />
<ResourceDictionary Source="/SettingsXAML/Themes/Colors.xaml" /> <ResourceDictionary Source="/SettingsXAML/Themes/Colors.xaml" />

2
src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock/IsEnabledTextBlock.cs
View File

@@ -14,7 +14,7 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
{ {
public IsEnabledTextBlock() public IsEnabledTextBlock()
{ {
this.DefaultStyleKey = typeof(IsEnabledTextBlock); this.Style = (Style)App.Current.Resources["DefaultIsEnabledTextBlockStyle"];
} }
protected override void OnApplyTemplate() protected override void OnApplyTemplate()

6
src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml
View File

@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:Microsoft.PowerToys.Settings.UI.Controls"> xmlns:local="using:Microsoft.PowerToys.Settings.UI.Controls">
<Style TargetType="local:IsEnabledTextBlock"> <Style x:Key="DefaultIsEnabledTextBlockStyle" TargetType="local:IsEnabledTextBlock">
<Setter Property="Foreground" Value="{ThemeResource DefaultTextForegroundThemeBrush}" /> <Setter Property="Foreground" Value="{ThemeResource DefaultTextForegroundThemeBrush}" />
<Setter Property="IsTabStop" Value="False" /> <Setter Property="IsTabStop" Value="False" />
<Setter Property="Template"> <Setter Property="Template">
@@ -35,7 +35,9 @@
</Style> </Style>
<Style <Style
x:Key="SecondaryIsEnabledTextBlockStyle" x:Key="SecondaryIsEnabledTextBlockStyle"
TargetType="local:IsEnabledTextBlock"> TargetType="local:IsEnabledTextBlock"
BasedOn="{StaticResource DefaultIsEnabledTextBlockStyle}"
>
<Setter Property="Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}" /> <Setter Property="Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}" />
<Setter Property="FontSize" Value="{StaticResource SecondaryTextFontSize}" /> <Setter Property="FontSize" Value="{StaticResource SecondaryTextFontSize}" />
</Style> </Style>