v0.3.0

* Revamped the Details view again. * Made font-based icons always be antialiased.
Tally · Aug 3, 2020 · 3d98063 · 3d98063
1 parent fd38cf6
commit 3d98063
Show file tree

Hide file tree

Showing 10 changed files with 263 additions and 184 deletions.
diff --git a/Constants.xaml b/Constants.xaml
@@ -11,16 +11,17 @@
     <Thickness x:Key="PopupBorderThickness">1</Thickness>
     <Thickness x:Key="ControlBorderThickness">1</Thickness>
     <sys:Double x:Key="EllipseBorderThickness">1</sys:Double>
-    <CornerRadius x:Key="ControlCornerRadius">1</CornerRadius>
+    <CornerRadius x:Key="ControlCornerRadius">2</CornerRadius>
+    <sys:Double x:Key="GroupSeparatorOpacity">1</sys:Double>
 
     <!-- Also controls corners of associated borders. -->
     <CornerRadius x:Key="CoverCornerRadius">5</CornerRadius>
 
     <!-- Not currently functioning; hopefully you have this font installed already. -->
-    <FontFamily x:Key="SymbolFont">Fonts/segoeuisym.ttf#Segoe UI Symbol</FontFamily>
+    <FontFamily x:Key="SymbolFont">segoeuisym.ttf#Segoe UI Symbol</FontFamily>
 
     <!-- Effectively the Accent Color: #AARRGGBB, #RRGGBB, & Web safe colors are accepted. -->
-    <!-- For grey try: #A6A6A6, for gold try #F3C443, for default blue try #55CDFF -->
+    <!-- For grey try: #A6A6A6, for gold try #F3C443, Playnite Icon red is #FB1F51 for default blue try #55CDFF -->
     <Color x:Key="GlyphColor">#55CDFF</Color>
 
     <!-- Currently Unused -->
@@ -40,6 +41,7 @@
     <Color x:Key="GridItemBackgroundColor">#636363</Color>
     <Color x:Key="PanelSeparatorColor">#2B2B2B</Color>
     <Color x:Key="PanelBackgroundColor">#191919</Color>
+    <Color x:Key="DetailsButtonBackGround">#626262</Color>
 
     <SolidColorBrush x:Key="ControlBackgroundBrush" Color="Transparent" />
     <SolidColorBrush x:Key="TextBrush" Color="{DynamicResource TextColor}" />
@@ -58,11 +60,13 @@
     <SolidColorBrush x:Key="PanelSeparatorBrush" Color="{DynamicResource PanelSeparatorColor}" Opacity=".5"/>
     <SolidColorBrush x:Key="PanelBackgroundBrush" Color="{DynamicResource PanelBackgroundColor}" Opacity=".5" />
     <SolidColorBrush x:Key="PopupBackgroundBrush" Color="{DynamicResource PopupBackgroundColor}" />
-    <SolidColorBrush x:Key="DetailsPanelBrush" Color="{DynamicResource PopupBackgroundColor}" Opacity=".5" />
+    <SolidColorBrush x:Key="DetailsPanelBrush" Color="{DynamicResource PanelBackgroundColor}" Opacity=".5" />
     <SolidColorBrush x:Key="PlayButtonBrush" Color="#19B14E" />
     <SolidColorBrush x:Key="PlayBorderBrush" Color="#C1FFCB" />
-    <SolidColorBrush x:Key="TitlebarBrush" Color="{DynamicResource PanelBackgroundColor}" />
+    <SolidColorBrush x:Key="TitlebarBrush" Color="{DynamicResource PanelBackgroundColor}" Opacity="1"/>
     <SolidColorBrush x:Key="DisabledBackgroundBrush" Color="{DynamicResource MainColorDark}" />
+    <SolidColorBrush x:Key="DetailsButtonBrush" Color="{DynamicResource DetailsButtonBackGround}" Opacity=".7"/>
+    <SolidColorBrush x:Key="DetailsViewGroupTextBrush" Color="{DynamicResource GlyphColor}" />
 
     <SolidColorBrush x:Key="PositiveRatingBrush" Color="#78ffa0" />
     <SolidColorBrush x:Key="NegativeRatingBrush" Color="#ff6b6b" />
@@ -71,17 +75,17 @@
     <SolidColorBrush x:Key="ExpanderBackgroundBrush" Color="Transparent" />
 
     <LinearGradientBrush x:Key="ExpanderBackgroundBrushOff" StartPoint="0.0,0.0" EndPoint="1.0,0.0">
-        <GradientStop Color="#80171717" Offset="0.0" />
-        <GradientStop Color="#00171717" Offset="1.0" />
+        <GradientStop Color="#804D4D4D" Offset="0.0" />
+        <GradientStop Color="#004D4D4D" Offset="1.0" />
     </LinearGradientBrush>
 
     <SolidColorBrush x:Key="WindowBackgroundBrush" Color="{DynamicResource PopupBackgroundColor}"/>
 
     <!-- For a solid cover highlight, swap the keys of the below resources -->
-    <SolidColorBrush x:Key="CoverHighlightSolid" Color="#40FFFFFF" />
+    <SolidColorBrush x:Key="CoverHighlightBrushOff" Color="#40FFFFFF" />
 
-    <LinearGradientBrush x:Key="CoverHighlightBrush" StartPoint="0.5,0.0" EndPoint="0.5,0.75" >
-        <GradientStop Color="#40FFFFFF" Offset="0"/>
+    <LinearGradientBrush x:Key="CoverHighlightBrush" StartPoint="0.0,0.0" EndPoint="0.5,0.5" >
+        <GradientStop Color="#40FFFFFF" Offset="0.75"/>
         <GradientStop Color="#00FFFFFF" Offset="1.0"/>
     </LinearGradientBrush>
 

diff --git a/DerivedStyles/DetailsViewGroupStyle.xaml b/DerivedStyles/DetailsViewGroupStyle.xaml
@@ -12,36 +12,38 @@
                               ExpanderBehaviors.SaveState="True"
                               ExpanderBehaviors.SaveStateId="{Binding Name, Mode=OneWay}">
                         <Expander.Header>
-                            <Grid HorizontalAlignment="Stretch">
+                            <Grid HorizontalAlignment="Stretch" Margin="0">
                                 <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto"/>
                                     <ColumnDefinition Width="Auto"/>
                                     <ColumnDefinition Width="*" />
                                 </Grid.ColumnDefinitions>
-
-                                <TextBlock Grid.Column="0" Foreground="{DynamicResource GlyphBrush}"
-                                           VerticalAlignment="Center" HorizontalAlignment="Left"
-                                           TextAlignment="Center" Margin="0,0,5,0" FontSize="{DynamicResource FontSizeLarge}"
-                                           Typography.Capitals="SmallCaps" TextBlock.FontWeight="SemiBold">
-                                        <TextBlock.Style>
-                                            <Style TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
-                                                <Setter Property="Text" Value="{Binding Name, Converter={StaticResource ObjectToStringConverter}}" />
-                                                <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding Name, Converter={StaticResource ObjectToStringConverter}}" Value="{x:Null}">
-                                                        <Setter Property="Text" Value="{DynamicResource LOCNone}" />
-                                                    </DataTrigger>
-                                                    <DataTrigger Binding="{Binding Name, Converter={StaticResource ObjectToStringConverter}}" Value="">
-                                                        <Setter Property="Text" Value="{DynamicResource LOCNone}" />
-                                                    </DataTrigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </TextBlock.Style>
-                                    </TextBlock>
-                                <TextBlock Text="{Binding Items.Count, Mode=OneWay, StringFormat=({0})}"
+                                <TextBlock Grid.Column="0"
+                                    Foreground="{DynamicResource DetailsViewGroupTextBrush}"
+                                    VerticalAlignment="Center" HorizontalAlignment="Left"
+                                    TextAlignment="Center" Margin="0,0,5,0" FontSize="{DynamicResource FontSizeLarge}"
+                                    Typography.Capitals="SmallCaps" TextBlock.FontWeight="SemiBold">
+                                    <TextBlock.Style>
+                                        <Style TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
+                                            <Setter Property="Text" Value="{Binding Name, Converter={StaticResource ObjectToStringConverter}}" />
+                                            <Style.Triggers>
+                                                <DataTrigger Binding="{Binding Name, Converter={StaticResource ObjectToStringConverter}}" Value="{x:Null}">
+                                                    <Setter Property="Text" Value="{DynamicResource LOCNone}" />
+                                                </DataTrigger>
+                                                <DataTrigger Binding="{Binding Name, Converter={StaticResource ObjectToStringConverter}}" Value="">
+                                                    <Setter Property="Text" Value="{DynamicResource LOCNone}" />
+                                                </DataTrigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </TextBlock.Style>
+                                </TextBlock>
+                                <TextBlock Grid.Column="1" Text="{Binding Items.Count, Mode=OneWay, StringFormat=({0})}"
+                                           Foreground="{DynamicResource DetailsViewGroupTextBrush}"
                                            VerticalAlignment="Center" HorizontalAlignment="Left"
                                            Style="{DynamicResource BaseTextBlockStyle}"
                                            DockPanel.Dock="Left" TextAlignment="Center"
-                                           Visibility="{Settings ShowGroupCount}"/>
-                                <Separator Grid.Column="1"/>
+                                           Visibility="{Settings ShowGroupCount}" Margin="0,0,5,0"/>
+                                <Separator Grid.Column="2" Opacity="{DynamicResource GroupSeparatorOpacity}" VerticalAlignment="Center"/>
                             </Grid>
                         </Expander.Header>
                         <ItemsPresenter />

diff --git a/DerivedStyles/GridViewItemStyle.xaml b/DerivedStyles/GridViewItemStyle.xaml
@@ -35,7 +35,7 @@
                                    TextAlignment="Center" TextWrapping="Wrap"
                                    TextTrimming="WordEllipsis"
                                    VerticalAlignment="Center"
-                                   Padding="2,5,2,5" 
+                                   Padding="2,5,2,5" FontSize="{DynamicResource FontSizeLarge}"
                                    Width="{Settings GridItemWidth}" 
                                    Typography.Capitals="SmallCaps"
                                    Visibility="{Settings ShowNamesUnderCovers}"/>

diff --git a/DerivedStyles/GridViewItemTemplate.xaml b/DerivedStyles/GridViewItemTemplate.xaml
@@ -43,12 +43,12 @@
                                                 CornerRadius="{DynamicResource ControlCornerRadius}"
                                                 Margin="30,2,30,2">
                                             <StackPanel Orientation="Horizontal" Cursor="Hand">
-                                                <Button Name="PART_ButtonPlay" Style="{StaticResource SimpleButton}"
+                                                <Button Name="PART_ButtonPlay" Style="{DynamicResource GlyphButton}"
                                                 Margin="4,0,4,0" VerticalAlignment="Center"
-                                                Content="&#xE102;" FontFamily="Segoe UI Symbol" />
-                                                <Button Name="PART_ButtonInfo" Style="{StaticResource SimpleButton}"
+                                                Content="&#xE102;" FontFamily="{DynamicResource SymbolFont}" />
+                                                <Button Name="PART_ButtonInfo" Style="{DynamicResource GlyphButton}"
                                                 Margin="4,0,4,0" VerticalAlignment="Center"
-                                                Content="&#xE146;" FontFamily="Segoe UI Symbol" />
+                                                Content="&#xE146;" FontFamily="{DynamicResource SymbolFont}" />
                                             </StackPanel>
                                         </Border>
                                     </Viewbox>

diff --git a/DerivedStyles/PlayButton.xaml b/DerivedStyles/PlayButton.xaml
@@ -15,7 +15,7 @@
                                 BorderThickness="{TemplateBinding BorderThickness}"  Background="{TemplateBinding Background}"
                                 Opacity="1" CornerRadius="{DynamicResource ControlCornerRadius}"/>
                         <StackPanel Orientation="Horizontal" TextBlock.FontWeight="Bold" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                            <TextBlock Text="&#xE102; " TextBlock.FontFamily="Segoe UI Symbol" />
+                            <TextBlock Text="&#xE102; " TextBlock.FontFamily="{DynamicResource SymbolFont}" />
                             <ContentPresenter RecognizesAccessKey="True"/>
                         </StackPanel>
                     </Grid>

diff --git a/DerivedStyles/Simplebutton.xaml b/DerivedStyles/Simplebutton.xaml
@@ -1,6 +1,5 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
     <Style x:Key="SimpleButton" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
         <Setter Property="FontSize" Value="{DynamicResource FontSize}" />
         <Setter Property="Margin" Value="0,3,0,3" />
@@ -25,4 +24,7 @@
             </Trigger>
         </Style.Triggers>
     </Style>
+    <Style x:Key="GlyphButton" TargetType="Button" BasedOn="{StaticResource SimpleButton}">
+        <Setter Property="TextOptions.TextRenderingMode" Value="Aliased"/>
+    </Style>
 </ResourceDictionary>