v0.9.4

Tally · Feb 15, 2021 · 682405c · 682405c
1 parent 047338b
commit 682405c
Show file tree

Hide file tree

Showing 16 changed files with 817 additions and 506 deletions.
diff --git a/Magpie_Desktop/Constants.xaml b/Magpie_Desktop/Constants.xaml
@@ -68,8 +68,8 @@
 
     <!-- Magpie-Specific Variables-->
 
-    <sys:Boolean x:Key="UseAbsoluteExtraMetadataPath">true</sys:Boolean>
-    <sys:String x:Key="ExtraMetadataPath">C:\Users\Tally\AppData\Roaming\Playnite</sys:String>
+    <sys:Boolean x:Key="UseAbsoluteExtraMetadataPath">false</sys:Boolean>
+    <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>
 
@@ -110,4 +110,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/GridViewItemStyle.xaml b/Magpie_Desktop/DerivedStyles/GridViewItemStyle.xaml
@@ -13,13 +13,11 @@
                           Margin="{Settings ItemSpacingMargin}"
                           x:Name="ItemGrid">
                         <StackPanel Orientation="Vertical">
-                            <Border x:Name="SelectionBorder" CornerRadius="{DynamicResource ControlCornerRadius}"
-                                Padding="{Settings GridItemMargin}"
-                                BorderBrush="{DynamicResource GridItemBackgroundBrush}"
-                                Background="{DynamicResource GridItemBackgroundBrush}">
-                                <Border>
-                                    <ContentPresenter />
-                                    <Border.OpacityMask>
+                            <Border x:Name="SelectionBorder" Padding="{Settings GridItemMargin}"
+                                    BorderBrush="{DynamicResource GridItemBackgroundBrush}"
+                                    Background="{DynamicResource GridItemBackgroundBrush}">
+                                <ContentPresenter>
+                                    <ContentPresenter.OpacityMask>
                                         <DrawingBrush x:Name="CoverMask" RenderOptions.CachingHint="Cache">
                                             <DrawingBrush.Drawing>
                                                 <GeometryDrawing Brush="White">
@@ -32,8 +30,8 @@
                                                 </GeometryDrawing>
                                             </DrawingBrush.Drawing>
                                         </DrawingBrush>
-                                    </Border.OpacityMask>
-                                </Border>
+                                    </ContentPresenter.OpacityMask>
+                                </ContentPresenter>
                                 <Border.OpacityMask>
                                     <DrawingBrush RenderOptions.CachingHint="Cache">
                                         <DrawingBrush.Drawing>

diff --git a/Magpie_Desktop/DerivedStyles/GridViewItemTemplate.xaml b/Magpie_Desktop/DerivedStyles/GridViewItemTemplate.xaml
@@ -5,54 +5,47 @@
                     mc:Ignorable="d">
 
     <Style x:Key="GridViewItemTemplate" TargetType="{x:Type GameListItem}">
+        <Setter Property="UseLayoutRounding" Value="True" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type GameListItem}">
-                    <Border >
+                    <Border>
                         <StackPanel Name="PART_PanelHost"
                                     d:DataContext="{x:Static DesignMainViewModel.DesignSelectedGameIntance}">
-                            <Border BorderThickness="0" >
-                                <Grid Width="{Settings GridItemWidth}"
+                            <Grid Width="{Settings GridItemWidth}"
                                     Height="{Settings GridItemHeight}">
-                                    <Image Name="PART_ImageCover"
-                                         RenderOptions.BitmapScalingMode="Fant" StretchDirection="Both"
-                                         HorizontalAlignment="Center" VerticalAlignment="Center"
-                                         Stretch="{Settings CoverArtStretch}" />
-                                    <Border Background="#99000000" x:Name="TextGameName" Visibility="Collapsed">
-                                        <TextBlock Text="{Binding DisplayName}"
+                                <Image Name="PART_ImageCover" RenderOptions.BitmapScalingMode="Fant"
+                                       StretchDirection="Both" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                       Stretch="{Settings CoverArtStretch}"/>
+                                <Border Background="#99000000" x:Name="TextGameName"
+                                        Visibility="Collapsed">
+                                    <TextBlock Text="{Binding DisplayName}"
                                            TextWrapping="Wrap" Margin="5"
                                            Style="{StaticResource BaseTextBlockStyle}"
                                            TextTrimming="CharacterEllipsis" TextAlignment="Center"
                                            HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                    </Border>
-                                    <Border Background="{DynamicResource CoverHighlightBrush}"
-                                                x:Name="BorderMouseOver" Visibility="Collapsed"/>
-                                    <Border Background="#AA000000"
-                                                x:Name="BorderUninstalled" Visibility="Collapsed"/>
-                                    <Grid>
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="7*"/>
-                                            <RowDefinition/>
-                                        </Grid.RowDefinitions>
-                                        <Border Name="GameControls"  Visibility="Collapsed"
-                                                Background="{DynamicResource ControlBackgroundBrush}"
-                                                BorderThickness="0" Grid.Row="4"
-                                                CornerRadius="{DynamicResource ControlCornerRadius}"
-                                                Margin="0" HorizontalAlignment="Stretch">
-                                            <Viewbox VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
-                                                <StackPanel Orientation="Horizontal" Cursor="Hand" HorizontalAlignment="Center">
-                                                    <Button Name="PART_ButtonPlay" Style="{DynamicResource GlyphButton}"
-                                                Margin="4,0,4,0" VerticalAlignment="Center"
-                                                Content="&#xE102;" FontFamily="{DynamicResource SymbolFont}" />
-                                                    <Button Name="PART_ButtonInfo" Style="{DynamicResource GlyphButton}"
-                                                Margin="4,0,4,0" VerticalAlignment="Center"
-                                                Content="&#x24D8;" FontFamily="{DynamicResource SymbolFont}"/>
-                                                </StackPanel>
-                                            </Viewbox>
-                                        </Border>
-                                    </Grid>
-                                </Grid>
-                            </Border>
+                                </Border>
+                                <Border Background="{DynamicResource CoverHighlightBrush}"
+                                        x:Name="BorderMouseOver" Visibility="Collapsed"/>
+                                <Border Background="#AA000000" x:Name="BorderUninstalled" Visibility="Collapsed"/>
+                                <Border Name="GameControls"  Visibility="Collapsed" VerticalAlignment="Bottom"
+                                        HorizontalAlignment="Center" Margin="5" CornerRadius="5">
+                                    <Border.Background>
+                                        <SolidColorBrush Color="{DynamicResource PopupBackgroundColor}" Opacity="0.7"/>
+                                    </Border.Background>
+                                    <Viewbox MaxHeight="50" MinHeight="20">
+                                        <StackPanel Orientation="Horizontal" Cursor="Hand">
+                                            <Button Name="PART_ButtonPlay" Style="{DynamicResource GlyphButton}"
+                                                    Margin="4,0,4,0" Content="&#xE102;"
+                                                    FontFamily="{DynamicResource SymbolFont}" />
+                                            <Button Name="PART_ButtonInfo" Style="{DynamicResource GlyphButton}"
+                                                    Margin="4,0,4,0" Content="&#x24D8;"
+                                                    FontFamily="{DynamicResource SymbolFont}"/>
+                                        </StackPanel>
+                                    </Viewbox>
+                                </Border>
+                            </Grid>
                         </StackPanel>
 
                     </Border>

diff --git a/Magpie_Desktop/DerivedStyles/MainWindowStyle.xaml b/Magpie_Desktop/DerivedStyles/MainWindowStyle.xaml
@@ -7,6 +7,7 @@
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="TextOptions.TextFormattingMode" Value="Ideal" />
         <Setter Property="TextOptions.TextRenderingMode" Value="Auto" />
+        <Setter Property="UseLayoutRounding" Value="True"/>
         <Setter Property="WindowChrome.WindowChrome">
             <Setter.Value>
                 <WindowChrome CaptionHeight="25" CornerRadius="0" ResizeBorderThickness="4"