CodeMirror/VRCMelonAssistant
1
0
Fork 0
mirror of https://github.com/knah/VRCMelonAssistant.git synced 2024-06-28 19:10:45 +12:00
Code Issues Projects Releases Wiki Activity

Add CheckBoxItem/CheckBox (still WIP)

Browse source
This commit is contained in:
Caeden Statia 2020-01-31 22:01:44 -08:00
parent cc3b9f44ce
commit 448a71a151
2 changed files with 95 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
ModAssistant/App.xaml
View file

@ -23,8 +23,6 @@
Value="Center" />
<Setter Property="VerticalContentAlignment"
Value="Center" />
<Setter Property="Padding"
Value="10,2,10,2" />
<Setter Property="MinHeight"
Value="25" />
<Setter Property="Template">
@ -89,6 +87,8 @@
<Style TargetType="TextBlock">
<Setter Property="TextBlock.Foreground" Value="{DynamicResource TextColor}"/>
<Setter Property="TextWrapping" Value="NoWrap"/>
<Setter Property="TextTrimming" Value="None"/>
</Style>
<Style TargetType="GridViewColumnHeader">
@ -266,6 +266,91 @@
<Setter Property="Fill" Value="{DynamicResource ModAssistantBackground}"/>
</Style>
<Style TargetType="ComboBoxItem" x:Key="{x:Type ComboBoxItem}">
<Setter Property="UIElement.SnapsToDevicePixels" Value="True" />
<Setter Property="Padding" Value="4,1" />
<Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
<Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
<Setter Property="Background" Value="{DynamicResource ComboBoxBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource ComboBoxOutline}" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ComboBoxItem}">
<Border
Name="Bd"
BorderBrush="{DynamicResource ComboBoxOutline}"
BorderThickness="{TemplateBinding BorderThickness}"
Background="{DynamicResource ComboBoxBackground}"
Padding="{TemplateBinding Padding}"
SnapsToDevicePixels="True">
<ContentPresenter
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsEnabled" Value="False">
<Setter TargetName="Bd" Property="Background" Value="{DynamicResource SystemColors.GrayTextBrushKey}"/>
</Trigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="ListBoxItem.IsSelected" Value="False" />
<Condition Property="UIElement.IsMouseOver" Value="True" />
<Condition Property="UIElement.IsKeyboardFocused" Value="False" />
</MultiTrigger.Conditions>
<Setter TargetName="Bd" Property="Background" Value="{DynamicResource ComboBoxHighlighted}" />
</MultiTrigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="ListBoxItem.IsSelected" Value="True" />
<Condition Property="UIElement.IsMouseOver" Value="False" />
<Condition Property="UIElement.IsKeyboardFocused" Value="True" />
</MultiTrigger.Conditions>
<Setter TargetName="Bd" Property="Background" Value="{DynamicResource ComboBoxSelected}" />
</MultiTrigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="ListBoxItem.IsSelected" Value="True" />
<Condition Property="UIElement.IsMouseOver" Value="True" />
</MultiTrigger.Conditions>
<Setter TargetName="Bd" Property="Background" Value="{DynamicResource ComboBoxSelected}" />
</MultiTrigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="ListBoxItem.IsSelected" Value="True" />
<Condition Property="UIElement.IsMouseOver" Value="False" />
<Condition Property="UIElement.IsKeyboardFocused" Value="False" />
</MultiTrigger.Conditions>
<Setter TargetName="Bd" Property="Background" Value="{DynamicResource ComboBoxSelected}" />
</MultiTrigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="ListBoxItem.IsSelected" Value="False" />
<Condition Property="UIElement.IsMouseOver" Value="False" />
<Condition Property="UIElement.IsKeyboardFocused" Value="True" />
</MultiTrigger.Conditions>
<Setter TargetName="Bd" Property="Background" Value="{DynamicResource ComboBoxHighlighted}" />
</MultiTrigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="ListBoxItem.IsSelected" Value="False" />
<Condition Property="UIElement.IsMouseOver" Value="True" />
<Condition Property="UIElement.IsKeyboardFocused" Value="True" />
</MultiTrigger.Conditions>
<Setter TargetName="Bd" Property="Background" Value="{DynamicResource ComboBoxHighlighted}" />
</MultiTrigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style TargetType="ComboBox">
<Setter Property="Foreground" Value="{DynamicResource ComboBoxTextColor}"/>
<Setter Property="BorderBrush" Value="{DynamicResource ComboBoxOutline}"/>
</Style>
</ResourceDictionary>
</Application.Resources>
</Application>

9
ModAssistant/Themes/Dark.xaml
View file

@ -20,6 +20,12 @@
<SolidColorBrush x:Key="ModListItemHighlighted" Color="#454545"/>
<SolidColorBrush x:Key="ModListItemSelected" Color="#696969"/>
<SolidColorBrush x:Key="ComboBoxBackground" Color="#2E2E2E"/>
<SolidColorBrush x:Key="ComboBoxTextColor" Color="Black"/>
<SolidColorBrush x:Key="ComboBoxOutline" Color="#696969"/>
<SolidColorBrush x:Key="ComboBoxHighlighted" Color="#454545"/>
<SolidColorBrush x:Key="ComboBoxSelected" Color="#696969"/>
<SolidColorBrush x:Key="CheckboxDefaultBackground" Color="#454545"/>
<SolidColorBrush x:Key="CheckboxDefaultOutlineColor" Color="LightGray"/>
<SolidColorBrush x:Key="CheckboxDisabledBackground" Color="#1a1a1a"/>
@ -29,8 +35,9 @@
<SolidColorBrush x:Key="CheckboxHoveredTickColor" Color="White"/>
<SolidColorBrush x:Key="CheckboxTickColor" Color="White"/>
<SolidColorBrush x:Key="CheckboxPressedBackground" Color="#FFBFBFBF"/>
<SolidColorBrush x:Key="ModAssistantBackground" Color="#0f0f0f"/>
<SolidColorBrush x:Key="BottomStatusBarBackground" Color="#2E2E2E"/>
<SolidColorBrush x:Key="InfoIconColor" Color="#0DCAC8"/>
<SolidColorBrush x:Key="ModsIconColor" Color="#833BCE"/>
<SolidColorBrush x:Key="AboutIconColor" Color="#FF0000"/>