mirror of
https://github.com/knah/VRCMelonAssistant.git
synced 2024-09-30 00:56:15 +13:00
Merge pull request #9 from lolPants/fix/remove-highlight
Remove extra highlight that would tint ModListItemHighlighted
This commit is contained in:
commit
59b68b1054
5 changed files with 17 additions and 9 deletions
|
@ -15,9 +15,9 @@
|
||||||
BorderThickness="1">
|
BorderThickness="1">
|
||||||
<Grid>
|
<Grid>
|
||||||
<Rectangle
|
<Rectangle
|
||||||
Name="UpperHighlight"
|
Name="BorderBox"
|
||||||
Visibility="Collapsed"
|
Visibility="Collapsed"
|
||||||
Fill="#75FFFFFF" />
|
Fill="Transparent" />
|
||||||
<GridViewRowPresenter
|
<GridViewRowPresenter
|
||||||
Grid.RowSpan="2"
|
Grid.RowSpan="2"
|
||||||
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
|
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
|
||||||
|
@ -28,11 +28,11 @@
|
||||||
<ControlTemplate.Triggers>
|
<ControlTemplate.Triggers>
|
||||||
<Trigger Property="IsMouseOver" Value="True">
|
<Trigger Property="IsMouseOver" Value="True">
|
||||||
<Setter Property="Background" Value="{DynamicResource ModListItemHighlighted}"/>
|
<Setter Property="Background" Value="{DynamicResource ModListItemHighlighted}"/>
|
||||||
<Setter TargetName="UpperHighlight" Property="Visibility" Value="Visible"/>
|
<Setter Property="BorderBrush" Value="{DynamicResource ModListItemHighlightedOutline}"/>
|
||||||
</Trigger>
|
</Trigger>
|
||||||
<Trigger Property="ListBoxItem.IsSelected" Value="True">
|
<Trigger Property="ListBoxItem.IsSelected" Value="True">
|
||||||
<Setter Property="Background" Value="{DynamicResource ModListItemSelected}"/>
|
<Setter Property="Background" Value="{DynamicResource ModListItemSelected}"/>
|
||||||
<Setter TargetName="UpperHighlight" Property="Visibility" Value="Hidden"/>
|
<Setter Property="BorderBrush" Value="{DynamicResource ModListItemSelectedOutline}"/>
|
||||||
</Trigger>
|
</Trigger>
|
||||||
</ControlTemplate.Triggers>
|
</ControlTemplate.Triggers>
|
||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
|
|
|
@ -37,8 +37,10 @@
|
||||||
<SolidColorBrush x:Key="ModColumnHeaderHighlighted" Color="{DynamicResource ResourceKey=StandardHighlight}" />
|
<SolidColorBrush x:Key="ModColumnHeaderHighlighted" Color="{DynamicResource ResourceKey=StandardHighlight}" />
|
||||||
<SolidColorBrush x:Key="ModListBackground" Color="#10FFFFFF" />
|
<SolidColorBrush x:Key="ModListBackground" Color="#10FFFFFF" />
|
||||||
<SolidColorBrush x:Key="ModListBorderBrush" Color="{DynamicResource ResourceKey=StandardBorder}" />
|
<SolidColorBrush x:Key="ModListBorderBrush" Color="{DynamicResource ResourceKey=StandardBorder}" />
|
||||||
<SolidColorBrush x:Key="ModListItemHighlighted" Color="Transparent" />
|
<SolidColorBrush x:Key="ModListItemHighlighted" Color="#70404040" />
|
||||||
<SolidColorBrush x:Key="ModListItemSelected" Color="{DynamicResource ResourceKey=StandardActive}" />
|
<SolidColorBrush x:Key="ModListItemHighlightedOutline" Color="#40FFFFFF" />
|
||||||
|
<SolidColorBrush x:Key="ModListItemSelected" Color="#FF353535" />
|
||||||
|
<SolidColorBrush x:Key="ModListItemSelectedOutline" Color="#40FFFFFF" />
|
||||||
|
|
||||||
<!-- Combo Box (Version select) -->
|
<!-- Combo Box (Version select) -->
|
||||||
<SolidColorBrush x:Key="ComboBoxBackground" Color="{DynamicResource ResourceKey=StandardPrimary}" />
|
<SolidColorBrush x:Key="ComboBoxBackground" Color="{DynamicResource ResourceKey=StandardPrimary}" />
|
||||||
|
|
|
@ -27,8 +27,10 @@
|
||||||
<SolidColorBrush x:Key="ModColumnBorderBrush" Color="Gray"/>
|
<SolidColorBrush x:Key="ModColumnBorderBrush" Color="Gray"/>
|
||||||
<SolidColorBrush x:Key="ModColumnHeaderHighlighted" Color="#FFFF86FF"/>
|
<SolidColorBrush x:Key="ModColumnHeaderHighlighted" Color="#FFFF86FF"/>
|
||||||
<SolidColorBrush x:Key="ModListBackground" Color="#FFFCDCFF" />
|
<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="ModListItemSelected" Color="#FFFF88F4"/>
|
||||||
|
<SolidColorBrush x:Key="ModListItemSelectedOutline" Color="#FFFF88F4" />
|
||||||
|
|
||||||
<!-- Combo Box (Version select) -->
|
<!-- Combo Box (Version select) -->
|
||||||
<SolidColorBrush x:Key="ComboBoxBackground" Color="#FFE09EE0"/>
|
<SolidColorBrush x:Key="ComboBoxBackground" Color="#FFE09EE0"/>
|
||||||
|
|
|
@ -36,8 +36,10 @@
|
||||||
<SolidColorBrush x:Key="ModColumnHeaderHighlighted" Color="{DynamicResource ResourceKey=StandardHighlight}" />
|
<SolidColorBrush x:Key="ModColumnHeaderHighlighted" Color="{DynamicResource ResourceKey=StandardHighlight}" />
|
||||||
<SolidColorBrush x:Key="ModListBackground" Color="#09000000" />
|
<SolidColorBrush x:Key="ModListBackground" Color="#09000000" />
|
||||||
<SolidColorBrush x:Key="ModListBorderBrush" Color="{DynamicResource ResourceKey=StandardBorder}" />
|
<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="ModListItemSelected" Color="{DynamicResource ResourceKey=StandardActive}" />
|
||||||
|
<SolidColorBrush x:Key="ModListItemSelectedOutline" Color="#70000000" />
|
||||||
|
|
||||||
<!-- Combo Box (Version select) -->
|
<!-- Combo Box (Version select) -->
|
||||||
<SolidColorBrush x:Key="ComboBoxBackground" Color="{DynamicResource ResourceKey=StandardPrimary}" />
|
<SolidColorBrush x:Key="ComboBoxBackground" Color="{DynamicResource ResourceKey=StandardPrimary}" />
|
||||||
|
|
|
@ -52,8 +52,10 @@
|
||||||
<SolidColorBrush x:Key="ModColumnHeaderHighlighted" Color="{DynamicResource ResourceKey=StandardHighlight}"/>
|
<SolidColorBrush x:Key="ModColumnHeaderHighlighted" Color="{DynamicResource ResourceKey=StandardHighlight}"/>
|
||||||
<SolidColorBrush x:Key="ModListBackground" Color="{DynamicResource ResourceKey=StandardPrimary}" />
|
<SolidColorBrush x:Key="ModListBackground" Color="{DynamicResource ResourceKey=StandardPrimary}" />
|
||||||
<SolidColorBrush x:Key="ModListBorderBrush" Color="{DynamicResource ResourceKey=StandardBorder}" />
|
<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="ModListItemSelected" Color="{DynamicResource ResourceKey=StandardActive}"/>
|
||||||
|
<SolidColorBrush x:Key="ModListItemSelectedOutline" Color="{DynamicResource ResourceKey=StandardBorder}" />
|
||||||
|
|
||||||
<!-- Combo Box (Version select) -->
|
<!-- Combo Box (Version select) -->
|
||||||
<SolidColorBrush x:Key="ComboBoxBackground" Color="{DynamicResource ResourceKey=StandardPrimary}"/>
|
<SolidColorBrush x:Key="ComboBoxBackground" Color="{DynamicResource ResourceKey=StandardPrimary}"/>
|
||||||
|
|
Loading…
Reference in a new issue