Merge pull request #9 from lolPants/fix/remove-highlight

Remove extra highlight that would tint ModListItemHighlighted
This commit is contained in:
Assistant 2020-02-26 00:42:16 -07:00 committed by GitHub
commit 59b68b1054
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 9 deletions

View file

@ -15,9 +15,9 @@
BorderThickness="1">
<Grid>
<Rectangle
Name="UpperHighlight"
Name="BorderBox"
Visibility="Collapsed"
Fill="#75FFFFFF" />
Fill="Transparent" />
<GridViewRowPresenter
Grid.RowSpan="2"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
@ -28,11 +28,11 @@
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="{DynamicResource ModListItemHighlighted}"/>
<Setter TargetName="UpperHighlight" Property="Visibility" Value="Visible"/>
<Setter Property="BorderBrush" Value="{DynamicResource ModListItemHighlightedOutline}"/>
</Trigger>
<Trigger Property="ListBoxItem.IsSelected" Value="True">
<Setter Property="Background" Value="{DynamicResource ModListItemSelected}"/>
<Setter TargetName="UpperHighlight" Property="Visibility" Value="Hidden"/>
<Setter Property="BorderBrush" Value="{DynamicResource ModListItemSelectedOutline}"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>

View file

@ -37,8 +37,10 @@
<SolidColorBrush x:Key="ModColumnHeaderHighlighted" Color="{DynamicResource ResourceKey=StandardHighlight}" />
<SolidColorBrush x:Key="ModListBackground" Color="#10FFFFFF" />
<SolidColorBrush x:Key="ModListBorderBrush" Color="{DynamicResource ResourceKey=StandardBorder}" />
<SolidColorBrush x:Key="ModListItemHighlighted" Color="Transparent" />
<SolidColorBrush x:Key="ModListItemSelected" Color="{DynamicResource ResourceKey=StandardActive}" />
<SolidColorBrush x:Key="ModListItemHighlighted" Color="#70404040" />
<SolidColorBrush x:Key="ModListItemHighlightedOutline" Color="#40FFFFFF" />
<SolidColorBrush x:Key="ModListItemSelected" Color="#FF353535" />
<SolidColorBrush x:Key="ModListItemSelectedOutline" Color="#40FFFFFF" />
<!-- Combo Box (Version select) -->
<SolidColorBrush x:Key="ComboBoxBackground" Color="{DynamicResource ResourceKey=StandardPrimary}" />

View file

@ -27,8 +27,10 @@
<SolidColorBrush x:Key="ModColumnBorderBrush" Color="Gray"/>
<SolidColorBrush x:Key="ModColumnHeaderHighlighted" Color="#FFFF86FF"/>
<SolidColorBrush x:Key="ModListBackground" Color="#FFFCDCFF" />
<SolidColorBrush x:Key="ModListItemHighlighted" Color="#FFF8B6FF"/>
<SolidColorBrush x:Key="ModListItemHighlighted" Color="#FFFBD7FF"/>
<SolidColorBrush x:Key="ModListItemHighlightedOutline" Color="#FFCF61C4" />
<SolidColorBrush x:Key="ModListItemSelected" Color="#FFFF88F4"/>
<SolidColorBrush x:Key="ModListItemSelectedOutline" Color="#FFFF88F4" />
<!-- Combo Box (Version select) -->
<SolidColorBrush x:Key="ComboBoxBackground" Color="#FFE09EE0"/>

View file

@ -36,8 +36,10 @@
<SolidColorBrush x:Key="ModColumnHeaderHighlighted" Color="{DynamicResource ResourceKey=StandardHighlight}" />
<SolidColorBrush x:Key="ModListBackground" Color="#09000000" />
<SolidColorBrush x:Key="ModListBorderBrush" Color="{DynamicResource ResourceKey=StandardBorder}" />
<SolidColorBrush x:Key="ModListItemHighlighted" Color="#BBBBBB" />
<SolidColorBrush x:Key="ModListItemHighlighted" Color="#DADADA" />
<SolidColorBrush x:Key="ModListItemHighlightedOutline" Color="#60000000" />
<SolidColorBrush x:Key="ModListItemSelected" Color="{DynamicResource ResourceKey=StandardActive}" />
<SolidColorBrush x:Key="ModListItemSelectedOutline" Color="#70000000" />
<!-- Combo Box (Version select) -->
<SolidColorBrush x:Key="ComboBoxBackground" Color="{DynamicResource ResourceKey=StandardPrimary}" />

View file

@ -52,8 +52,10 @@
<SolidColorBrush x:Key="ModColumnHeaderHighlighted" Color="{DynamicResource ResourceKey=StandardHighlight}"/>
<SolidColorBrush x:Key="ModListBackground" Color="{DynamicResource ResourceKey=StandardPrimary}" />
<SolidColorBrush x:Key="ModListBorderBrush" Color="{DynamicResource ResourceKey=StandardBorder}" />
<SolidColorBrush x:Key="ModListItemHighlighted" Color="{DynamicResource ResourceKey=StandardHighlight}"/>
<SolidColorBrush x:Key="ModListItemHighlighted" Color="#A0C29F"/>
<SolidColorBrush x:Key="ModListItemHighlightedOutline" Color="{DynamicResource ResourceKey=StandardBorder}" />
<SolidColorBrush x:Key="ModListItemSelected" Color="{DynamicResource ResourceKey=StandardActive}"/>
<SolidColorBrush x:Key="ModListItemSelectedOutline" Color="{DynamicResource ResourceKey=StandardBorder}" />
<!-- Combo Box (Version select) -->
<SolidColorBrush x:Key="ComboBoxBackground" Color="{DynamicResource ResourceKey=StandardPrimary}"/>