Skip to content

Commit 646efea

Browse files
authored
Merge pull request #514 from dreamsyntax/consistency-colors-accessibility
Default Color Adjustments and Consistency for Accessibility
2 parents 0d954b0 + 3f0c7b9 commit 646efea

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

source/Reloaded.Mod.Launcher/Pages/BaseSubpages/SettingsPage.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
HorizontalAlignment="Center"
102102
TextWrapping="Wrap"
103103
FontSize="{DynamicResource FontSizeLarge}"
104-
Style="{DynamicResource RIIDefaultTextBlock}"
104+
Style="{DynamicResource TextblockWithColourChange}"
105105
Margin="{DynamicResource CommonItemVerticalMargin}"/>
106106

107107
<!-- Settings -->

source/Reloaded.Mod.Launcher/Reloaded.Mod.Launcher.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@
7777
</PackageReference>
7878
<PackageReference Include="Reloaded.Input" Version="2.2.0" />
7979
<PackageReference Include="Reloaded.Memory" Version="9.4.2" />
80-
<PackageReference Include="Reloaded.WPF" Version="3.3.1" />
81-
<PackageReference Include="Reloaded.WPF.Theme.Default" Version="3.2.1" />
80+
<PackageReference Include="Reloaded.WPF" Version="3.3.2" />
81+
<PackageReference Include="Reloaded.WPF.Theme.Default" Version="3.2.3" />
8282
<PackageReference Include="Sewer56.UI.Controller.Core" Version="1.1.0" />
8383
<PackageReference Include="Sewer56.UI.Controller.ReloadedInput.Configurator" Version="1.2.3" />
8484
<PackageReference Include="Sewer56.UI.Controller.WPF" Version="1.1.3" />

source/Reloaded.Mod.Launcher/Theme/Halogen/Styles.xaml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,6 @@
466466

467467
<!-- Checkbox -->
468468
<Style x:Key="DefaultCheckBoxBase" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource BaseStyle}">
469-
470469
<Setter Property="Background" Value="{StaticResource BorderColorBrush}"/>
471470
<Setter Property="VerticalContentAlignment" Value="Center" />
472471
<Setter Property="Height" Value="{DynamicResource CheckboxSize}" />
@@ -532,9 +531,17 @@
532531
</Style>
533532

534533
<Style x:Key="DefaultCheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource DefaultCheckBoxBase}">
535-
536-
<!-- Colour the checkbox. -->
537534
<Style.Triggers>
535+
<!-- Colour text content on IsMouseOver. -->
536+
<Trigger Property="IsMouseOver" Value="True">
537+
<Trigger.EnterActions>
538+
<BeginStoryboard Storyboard="{StaticResource ForegroundFadeTextToAccentLightest}"/>
539+
</Trigger.EnterActions>
540+
<Trigger.ExitActions>
541+
<BeginStoryboard Storyboard="{StaticResource ForegroundFadeAccentLightestToText}"/>
542+
</Trigger.ExitActions>
543+
</Trigger>
544+
<!-- Colour the checkbox. -->
538545
<Trigger Property="IsChecked" Value="True">
539546
<Trigger.EnterActions>
540547
<BeginStoryboard Storyboard="{StaticResource BackgroundFadeBorderToAccentLighter}"/>

0 commit comments

Comments
 (0)