v1.0.0

Tally · Mar 4, 2021 · dcc21e7 · dcc21e7
1 parent 435725b
commit dcc21e7
Show file tree

Hide file tree

Showing 12 changed files with 417 additions and 199 deletions.
diff --git a/Magpie_Desktop/Constants.xaml b/Magpie_Desktop/Constants.xaml
@@ -43,7 +43,7 @@
     <SolidColorBrush x:Key="TooltipBackgroundBrush" Color="{DynamicResource BackgroundToneColor}" />
     <SolidColorBrush x:Key="ButtonBackgroundBrush" Color="{DynamicResource ButtonBackgroundColor}"/>
     <SolidColorBrush x:Key="GridItemBackgroundBrush" Color="{DynamicResource GridItemBackgroundColor}" Opacity="0.7 "/>
-    <SolidColorBrush x:Key="PanelSeparatorBrush" Color="{DynamicResource PanelSeparatorColor}" Opacity="1"/>
+    <SolidColorBrush x:Key="PanelSeparatorBrush" Color="{DynamicResource PanelSeparatorColor}" Opacity="0.7"/>
     <SolidColorBrush x:Key="PopupBackgroundBrush" Color="{DynamicResource PopupBackgroundColor}" />
 
     <SolidColorBrush x:Key="PositiveRatingBrush" Color="#78ffa0" />
@@ -72,7 +72,9 @@
     <sys:String x:Key="ExtraMetadataPath">..\..\..\..</sys:String>
     <sys:String x:Key="AboutGameText">About the Game</sys:String>
     <sys:Boolean x:Key="BGModeOn">false</sys:Boolean>
-
+    <sys:Boolean x:Key="GridFavoriteHighlight">true</sys:Boolean>
+
+    <SolidColorBrush x:Key="FavoriteColorBrush" Color="{DynamicResource FavoriteColor}"/>
     <sys:Double x:Key="ControlCornerRadiusDouble">0</sys:Double>
     <sys:Double x:Key="GroupSeparatorOpacity">1</sys:Double>
     <FontFamily x:Key="SymbolFont">seguisym.ttf#Segoe UI Symbol</FontFamily>
@@ -86,19 +88,21 @@
     <Color x:Key="ContextButtonHighlightColor">#5C63BB</Color>
     <Color x:Key="ClearFilterButtonColor">#e34141</Color>
     <Color x:Key="PopupBackgroundTransparent">#00121212</Color>
+    <Color x:Key="FavoriteColor">Goldenrod</Color>
 
-    <SolidColorBrush x:Key="CoverHighlightBrush" Color="#20FFFFFF" />
+    <SolidColorBrush x:Key="CoverHighlightBrush" Color="#10FFFFFF" />
 
     <Color x:Key="NormalBorderColor">#282828</Color>
     <SolidColorBrush x:Key="TitlebarBrush" Color="{DynamicResource PopupBackgroundColor}" Opacity="0.7"/>
-    <SolidColorBrush x:Key="DisabledBackgroundBrush" Color="{DynamicResource MainColorDark}" />
+    <SolidColorBrush x:Key="DisabledBackgroundBrush" Color="{DynamicResource MainColorDark}"/>
     <SolidColorBrush x:Key="DetailsButtonBrush" Color="{DynamicResource HoverColor}" Opacity=".7"/>
     <SolidColorBrush x:Key="ButtonBorderBrush" Color="{DynamicResource ButtonBackgroundColor}" Opacity="1"/>
-    <SolidColorBrush x:Key="HoverBorderBrush" Color="{DynamicResource HoverColor}" Opacity="1" />
-    <SolidColorBrush x:Key="ButtonFocusBorderBrush" Color="{DynamicResource HoverColor}" Opacity="1" />
-    <SolidColorBrush x:Key="PanelBackgroundBrush" Color="{DynamicResource PopupBackgroundColor}" Opacity="0.7" />
-    <SolidColorBrush x:Key="DetailsPanelBrush" Color="{DynamicResource PopupBackgroundColor}" Opacity="0.7" />
-    <SolidColorBrush x:Key="DetailsViewGroupTextBrush" Color="{DynamicResource GlyphColor}" />
+    <SolidColorBrush x:Key="HoverBorderBrush" Color="{DynamicResource HoverColor}" Opacity="1"/>
+    <SolidColorBrush x:Key="ButtonFocusBorderBrush" Color="{DynamicResource HoverColor}" Opacity="1"/>
+    <SolidColorBrush x:Key="PanelBackgroundBrush" Color="{DynamicResource PopupBackgroundColor}" Opacity="0.7"/>
+    <SolidColorBrush x:Key="GridDetailsDrawerBrush" Color="{DynamicResource PopupBackgroundColor}" Opacity="0.9"/>
+    <SolidColorBrush x:Key="DetailsPanelBrush" Color="{DynamicResource PopupBackgroundColor}" Opacity="0.7"/>
+    <SolidColorBrush x:Key="DetailsViewGroupTextBrush" Color="{DynamicResource GlyphColor}"/>
 
     <SolidColorBrush x:Key="PlayButtonBrush" Color="{DynamicResource HoverColor}" Opacity="0.7" />
     <SolidColorBrush x:Key="PlayBorderBrush" Color="{DynamicResource HoverColor}" Opacity="1" />
@@ -110,4 +114,4 @@
     <SolidColorBrush x:Key="ClearFilterBorderBrush" Color="{DynamicResource ClearFilterButtonColor}" Opacity="1" />
     <SolidColorBrush x:Key="CoverOverlayBackgroundBrush" Color="{DynamicResource PanelBackgroundColor}" Opacity=".5" />
 
-</ResourceDictionary>
+</ResourceDictionary>
diff --git a/Magpie_Desktop/DerivedStyles/DetailsViewGroupStyle.xaml b/Magpie_Desktop/DerivedStyles/DetailsViewGroupStyle.xaml
@@ -11,7 +11,7 @@
                     <ExpanderEx BorderThickness="0" SaveGameGroupId="{Binding Name, Mode=OneWay}"
                                 IsExpanded="True">
                         <ExpanderEx.Header>
-                            <Grid HorizontalAlignment="Stretch" Margin="0">
+                            <Grid HorizontalAlignment="Stretch" Background="Transparent" Margin="0">
                                 <Grid.ContextMenu>
                                     <GameGroupMenu />
                                 </Grid.ContextMenu>

diff --git a/Magpie_Desktop/DerivedStyles/GridViewItemStyle.xaml b/Magpie_Desktop/DerivedStyles/GridViewItemStyle.xaml
@@ -13,9 +13,35 @@
                           Margin="{Settings ItemSpacingMargin}"
                           x:Name="ItemGrid">
                         <StackPanel Orientation="Vertical">
-                            <Border x:Name="SelectionBorder" Padding="{Settings GridItemMargin}"
-                                    BorderBrush="{DynamicResource GridItemBackgroundBrush}"
-                                    Background="{DynamicResource GridItemBackgroundBrush}">
+                            <Border x:Name="SelectionBorder" Padding="{Settings GridItemMargin}" Tag="{DynamicResource GridFavoriteHighlight}">
+                                <Border.Style>
+                                    <Style TargetType="Border">
+                                        <Setter Property="BorderBrush" Value="{DynamicResource GridItemBackgroundBrush}"/>
+                                        <Setter Property="Background" Value="{DynamicResource GridItemBackgroundBrush}"/>
+                                        <Setter Property="Effect">
+                                            <Setter.Value>
+                                                <DropShadowEffect ShadowDepth="0" Color="Black"
+                                                                  Opacity=".5" BlurRadius="10"/>
+                                            </Setter.Value>
+                                        </Setter>
+                                        <Style.Triggers>
+                                            <MultiDataTrigger>
+                                                <MultiDataTrigger.Conditions>
+                                                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true"/>
+                                                    <Condition Binding="{Binding Favorite}" Value="true"/>
+                                                </MultiDataTrigger.Conditions>
+                                                <Setter Property="BorderBrush" Value="{DynamicResource FavoriteColorBrush}"/>
+                                                <Setter Property="Background" Value="{DynamicResource FavoriteColorBrush}"/>
+                                                <Setter Property="Effect">
+                                                    <Setter.Value>
+                                                        <DropShadowEffect ShadowDepth="0" Color="{DynamicResource FavoriteColor}"
+                                                                  Opacity=".75" BlurRadius="10"/>
+                                                    </Setter.Value>
+                                                </Setter>
+                                            </MultiDataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </Border.Style>
                                 <ContentPresenter>
                                     <ContentPresenter.OpacityMask>
                                         <DrawingBrush x:Name="CoverMask" RenderOptions.CachingHint="Cache">
@@ -46,12 +72,6 @@
                                         </DrawingBrush.Drawing>
                                     </DrawingBrush>
                                 </Border.OpacityMask>
-                                <Border.Effect>
-                                    <DropShadowEffect ShadowDepth="0"
-                                              Color="Black"
-                                              Opacity=".5"
-                                              BlurRadius="10"/>
-                                </Border.Effect>
                             </Border>
                             <Border MaxHeight="60">
                                 <TextBlock Text="{Binding DisplayName}"