v0.7.0

* Bug fixes and performance improvements. * General formatting improvements on grid and details item overviews. * Readdition of background image to grid item details.
Tally · Jan 19, 2021 · b8b60a5 · b8b60a5
1 parent 69310f0
commit b8b60a5
Show file tree

Hide file tree

Showing 7 changed files with 491 additions and 472 deletions.
diff --git a/Constants.xaml b/Constants.xaml
@@ -26,7 +26,7 @@
     <Color x:Key="PopupBorderColor">#2B2B2B</Color>
     <Color x:Key="NormalBorderColor">#282828</Color>
     <Color x:Key="BackgroundToneColor">#202020</Color>
-    <Color x:Key="GridItemBackgroundColor">#636363</Color>
+    <Color x:Key="GridItemBackgroundColor">#6c6c6c</Color>
     <Color x:Key="PanelSeparatorColor">#282828</Color>
 
     <SolidColorBrush x:Key="ControlBackgroundBrush" Color="{DynamicResource ButtonBackgroundColor}" Opacity="1" />
@@ -62,7 +62,8 @@
     <!-- Some ideas for custom glyph colors:
     For grey try: #A6A6A6,
     for gold try #FFD768,
-    for blue try #448B9F -->
+    for red try #e34141,
+    for blue try #62c3df -->
 
     <!-- Magpie-Specific Variables-->
     <sys:Double x:Key="ControlCornerRadiusDouble">2</sys:Double>

diff --git a/DerivedStyles/GridViewItemStyle.xaml b/DerivedStyles/GridViewItemStyle.xaml
@@ -13,13 +13,29 @@
                           Margin="{Settings ItemSpacingMargin}"
                           x:Name="ItemGrid">
                         <StackPanel Orientation="Vertical">
-                            <Border x:Name="SelectionBorder"
-                                BorderThickness="{Settings GridItemMargin}"
+                            <Border x:Name="SelectionBorder" CornerRadius="{DynamicResource ControlCornerRadius}"
+                                Padding="{Settings GridItemMargin}"
                                 BorderBrush="{DynamicResource GridItemBackgroundBrush}"
                                 Background="{DynamicResource GridItemBackgroundBrush}">
-                                <ContentPresenter />
+                                <Border>
+                                    <ContentPresenter />
+                                    <Border.OpacityMask>
+                                        <DrawingBrush x:Name="CoverMask" RenderOptions.CachingHint="Cache">
+                                            <DrawingBrush.Drawing>
+                                                <GeometryDrawing Brush="White">
+                                                    <GeometryDrawing.Geometry>
+                                                        <RectangleGeometry 
+                                                         Rect="0,0,2,3"
+                                                         RadiusX="0.05"
+                                                         RadiusY="0.05" />
+                                                    </GeometryDrawing.Geometry>
+                                                </GeometryDrawing>
+                                            </DrawingBrush.Drawing>
+                                        </DrawingBrush>
+                                    </Border.OpacityMask>
+                                </Border>
                                 <Border.OpacityMask>
-                                    <DrawingBrush>
+                                    <DrawingBrush RenderOptions.CachingHint="Cache">
                                         <DrawingBrush.Drawing>
                                             <GeometryDrawing Brush="White">
                                                 <GeometryDrawing.Geometry>
@@ -58,8 +74,8 @@
                             <Setter Property="BorderBrush" Value="Transparent" TargetName="SelectionBorder" />
                         </DataTrigger>
                         <Trigger Property="IsSelected" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource TextBrush}" TargetName="SelectionBorder" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource TextBrush}" TargetName="SelectionBorder"/>
+                            <Setter Property="Background" Value="{DynamicResource TextBrushDarker}" TargetName="SelectionBorder" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource TextBrushDarker}" TargetName="SelectionBorder"/>
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter Property="BorderBrush" Value="{DynamicResource GlyphBrush}" TargetName="SelectionBorder"/>

diff --git a/DerivedStyles/GridViewItemTemplate.xaml b/DerivedStyles/GridViewItemTemplate.xaml
@@ -45,20 +45,6 @@
                                             </StackPanel>
                                         </Border>
                                     </Viewbox>
-                                    <Grid.OpacityMask>
-                                        <DrawingBrush>
-                                            <DrawingBrush.Drawing>
-                                                <GeometryDrawing Brush="White">
-                                                    <GeometryDrawing.Geometry>
-                                                        <RectangleGeometry 
-                                                         Rect="0,0,2,3"
-                                                         RadiusX=".05"
-                                                         RadiusY=".05" />
-                                                    </GeometryDrawing.Geometry>
-                                                </GeometryDrawing>
-                                            </DrawingBrush.Drawing>
-                                        </DrawingBrush>
-                                    </Grid.OpacityMask>
                                 </Grid>
                             </Border>
                         </StackPanel>

diff --git a/DerivedStyles/MainWindowStyle.xaml b/DerivedStyles/MainWindowStyle.xaml
@@ -21,7 +21,7 @@
                     </ControlTemplate.Resources>
                     <AdornerDecorator>
                         <Border x:Name="WindowBorder" BorderBrush="{DynamicResource PopupBorderBrush}" CornerRadius="0"
-                                BorderThickness="{TemplateBinding BorderThickness}"
+                                BorderThickness="0"
                                 Background="{TemplateBinding Background}">
                             <Grid>
                                 <ContentPresenter Margin="0,0,0,0"/>
@@ -36,6 +36,8 @@
                                         </StackPanel>
                                     </DockPanel>
                                 </DockPanel>
+                                <Border BorderBrush="{DynamicResource PopupBorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"
+                                        Background="Transparent" CornerRadius="0" IsHitTestVisible="False"/>
                             </Grid>
                         </Border>
                     </AdornerDecorator>