pre v0.1.1

Icon changes, further Details page changes.
Tally · Jul 26, 2020 · cf6a921 · cf6a921
1 parent 9614e49
commit cf6a921
Show file tree

Hide file tree

Showing 7 changed files with 157 additions and 151 deletions.
diff --git a/Constants.xaml b/Constants.xaml
@@ -20,7 +20,7 @@
     <FontFamily x:Key="SymbolFont">Fonts/segoeuisym.ttf#Segoe UI Symbol</FontFamily>
 
     <!-- Effectively the Accent Color: #AARRGGBB, #RRGGBB, & Web safe colors are accepted. -->
-    <Color x:Key="GlyphColor">#FF55CDFF</Color>
+    <Color x:Key="GlyphColor">#F3C443</Color>
 
     <!-- Currently Unused -->
     <Color x:Key="HighlightGlyphColor">#FFFF0000</Color>
@@ -67,10 +67,17 @@
     <SolidColorBrush x:Key="NegativeRatingBrush" Color="#ff6b6b" />
     <SolidColorBrush x:Key="MixedRatingBrush" Color="#fffca1" />
 
-    <SolidColorBrush x:Key="ExpanderBackgroundBrush" Color="#884D4D4D" />
+    <SolidColorBrush x:Key="ExpanderBackgroundBrush" Color="#80171717" />
+
+    <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" />
+    </LinearGradientBrush>
 
     <SolidColorBrush x:Key="WindowBackgroundBrush" Color="{DynamicResource PopupBackgroundColor}"/>
-
+
+    <SolidColorBrush x:Key="CoverHighlightSolid" Color="#40FFFFFF" />
+
     <LinearGradientBrush x:Key="CoverHighlightBrush" StartPoint="0.5,0.0" EndPoint="0.5,0.75" >
         <GradientStop Color="#40FFFFFF" Offset="0"/>
         <GradientStop Color="#00FFFFFF" Offset="1.0"/>

diff --git a/DerivedStyles/GridViewItemTemplate.xaml b/DerivedStyles/GridViewItemTemplate.xaml
@@ -48,7 +48,7 @@
                                                 Content="&#xE102;" FontFamily="Segoe UI Symbol" />
                                                 <Button Name="PART_ButtonInfo" Style="{StaticResource SimpleButton}"
                                                 Margin="4,0,4,0" VerticalAlignment="Center"
-                                                Content="&#x1f50e;" FontFamily="Segoe UI Symbol" />
+                                                Content="&#xE146;" FontFamily="Segoe UI Symbol" />
                                             </StackPanel>
                                         </Border>
                                     </Viewbox>
@@ -82,6 +82,9 @@
                             <Setter Property="Visibility" Value="Visible" TargetName="BorderMouseOver"/>
                             <Setter Property="Visibility" Value="Visible" TargetName="GameControls"/>
                         </Trigger>
+                        <DataTrigger Binding="{Settings GridViewDetailsPosition}" Value="Left">
+                            <Setter Property="Content" Value="&#xE145;" TargetName="PART_ButtonInfo" />
+                        </DataTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>

diff --git a/DerivedStyles/Simplebutton.xaml b/DerivedStyles/Simplebutton.xaml
@@ -5,6 +5,7 @@
         <Setter Property="FontSize" Value="{DynamicResource FontSize}" />
         <Setter Property="Margin" Value="0,3,0,3" />
         <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+        <Setter Property="Focusable" Value="False" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Button">

diff --git a/Views/DetailsViewGameOverview.xaml b/Views/DetailsViewGameOverview.xaml
diff --git a/Views/GridViewGameOverview.xaml b/Views/GridViewGameOverview.xaml
@@ -23,6 +23,7 @@
                                 </Style.Triggers>
                             </Style>
                         </Border.Style>
+
                         <DockPanel>
                             <Button HorizontalAlignment="Right" VerticalAlignment="Top"
                                     Content="r" FontFamily="Marlett"
@@ -99,6 +100,16 @@
                                 <ScrollViewer DockPanel.Dock="Top" HorizontalAlignment="Stretch"
                                               HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
                                     <DockPanel>
+
+                                        <HtmlTextView Name="PART_HtmlDescription" DockPanel.Dock="Top"
+                                                      Margin="5,5,0,5"
+                                                      HtmlFontSize="{DynamicResource FontSize}"
+                                                      HtmlFontFamily="{DynamicResource FontFamily}"
+                                                      HtmlForeground="{DynamicResource TextColor}"
+                                                      LinkForeground="{DynamicResource GlyphColor}"                                      
+                                                      ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                                                      ScrollViewer.VerticalScrollBarVisibility="Disabled"/>
+
                                         <StackPanel DockPanel.Dock="Top" Margin="5,0,0,0">
                                             <StackPanel.Resources>
                                                 <Style TargetType="ItemsControl">
@@ -186,15 +197,6 @@
                                                 <ItemsControl Name="PART_ItemsLinks" />
                                             </GridEx>
                                         </StackPanel>
-
-                                        <HtmlTextView Name="PART_HtmlDescription" DockPanel.Dock="Top"
-                                                      Margin="5,5,0,5"
-                                                      HtmlFontSize="{DynamicResource FontSize}"
-                                                      HtmlFontFamily="{DynamicResource FontFamily}"
-                                                      HtmlForeground="{DynamicResource TextColor}"
-                                                      LinkForeground="{DynamicResource GlyphColor}"                                      
-                                                      ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                                                      ScrollViewer.VerticalScrollBarVisibility="Disabled"/>
                                     </DockPanel>
                                 </ScrollViewer>
                             </DockPanel>

diff --git a/Views/MainPanel.xaml b/Views/MainPanel.xaml
@@ -31,8 +31,8 @@
                                   WindowChrome.IsHitTestVisibleInChrome="True"
                                          VerticalAlignment="Center" HorizontalAlignment="Center">
                                     <Button Style="{StaticResource SimpleButton}"
-                                     Content="&#x2261;" FontFamily="Segoe UI Symbol" FontSize="36"
-                                     Margin="0,-12,0,-5" FontWeight="Bold" BorderThickness="0" />
+                                     Content="&#x2261;" FontFamily="Segoe UI Symbol" FontSize="40"
+                                     Margin="0,-14,0,-5" FontWeight="Bold" BorderThickness="0" />
                                 </Border>
                                 <SearchBox x:Name="PART_TextMainSearch"
                                         Margin="20,6,0,6" DockPanel.Dock="Left"
@@ -43,7 +43,7 @@
                                     BorderBrush="Transparent" Cursor="Hand"
                                     DockPanel.Dock="Left" Margin="10,6,0,6" Width="35"
                                     WindowChrome.IsHitTestVisibleInChrome="True">
-                                    <Button Content="&#xE174;" FontSize="20"
+                                    <Button Content="&#xE115;" FontSize="20"
                                                FontFamily="Segoe UI Symbol" Style="{DynamicResource SimpleButton}"
                                            VerticalAlignment="Center" HorizontalAlignment="Center"/>
                                 </Border>

diff --git a/theme.yaml b/theme.yaml
@@ -1,4 +1,4 @@
 ThemeApiVersion: 1.6.0
-Name: Magpie
+Name: Magpie (Sisyphus Edition)
 Author: Dan Davis
-Version: 0.1.0
+Version: 0.1.1