Skip to content

Commit

Permalink
v0.8.4
Browse files Browse the repository at this point in the history 
__Changes__
 * Restored some info to top details area.
 * Fixed some logos being scaled down that shouldn't be.
 * Width of the details view main panel is available to be adjusted in ThemeModifier.
  • Loading branch information
@Tally
Tally authored Jan 28, 2021
1 parent c2aa18a commit 1800870
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 47 deletions.
8 changes: 5 additions & 3 deletions Constants.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<Color x:Key="MainColor">#2b2b2b</Color>
<Color x:Key="MainColorDark">#202020</Color>
<Color x:Key="HoverColor">#4d4d4d</Color>
<Color x:Key="GlyphColor">#62c3df</Color>
<Color x:Key="GlyphColor">#62C3DF</Color>
<Color x:Key="HighlightGlyphColor">#FFFF0000</Color>
<Color x:Key="PopupBackgroundColor">#121212</Color>
<Color x:Key="PopupBorderColor">#2B2B2B</Color>
Expand Down Expand Up @@ -62,8 +62,9 @@
<!-- Some ideas for custom glyph colors:
For grey try: #A6A6A6,
for gold try #FFD768,
for red try #e34141,
for blue try #62c3df -->
for salmon try #FF7A68,
for red try #E34141,
for blue try #62C3DF -->

<!-- Magpie-Specific Variables-->

Expand All @@ -75,6 +76,7 @@
<sys:Double x:Key="GroupSeparatorOpacity">1</sys:Double>
<FontFamily x:Key="SymbolFont">segoeuisym.ttf#Segoe UI Symbol</FontFamily>
<Visibility x:Key="TitleTextVisibility">Visible</Visibility>
<sys:Double x:Key="DetailsViewPanelWidth">1080</sys:Double>

<!-- Magpie-Specific Colors -->
<Color x:Key="ButtonBackgroundColor">#2b2b2b</Color>
Expand Down
88 changes: 46 additions & 42 deletions Views/DetailsViewGameOverview.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@
</FadeImage.ImageOpacityMask>
</FadeImage>
</ScrollViewer>
<Grid Grid.Row="0" Grid.Column="1" VerticalAlignment="Center"
HorizontalAlignment="Center" Margin="0"
<Grid Grid.Row="0" Grid.Column="1" VerticalAlignment="Stretch"
HorizontalAlignment="Stretch" Margin="0"
MaxWidth="1280" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*" />
Expand All @@ -108,8 +108,8 @@
<RowDefinition Height="4*" />
<RowDefinition Height="1*" />
</Grid.RowDefinitions>
<Image Grid.Column="1" Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center"
Stretch="Uniform" StretchDirection="DownOnly" Visibility="Visible"
<Image Grid.Column="1" Grid.Row="1" HorizontalAlignment="Center"
VerticalAlignment="Center" Stretch="Uniform"
Name="LogoImage" RenderOptions.BitmapScalingMode="Fant"
Tag="{DynamicResource UseAbsoluteExtraMetadataPath}">
<Image.Style>
Expand Down Expand Up @@ -166,7 +166,7 @@
</Style.Triggers>
</Style>
</Border.Style>
<DockPanel MaxWidth="1080">
<DockPanel MaxWidth="{DynamicResource DetailsViewPanelWidth}">
<Grid DockPanel.Dock="Top" HorizontalAlignment="Stretch" Background="Transparent" Margin="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
Expand Down Expand Up @@ -297,7 +297,7 @@
</Image>
<GridEx Margin="0,20,0,20" DockPanel.Dock="Top"
ColumnCount="2" StarColumns="1"
RowCount="15" AutoLayoutColumns="2">
RowCount="10" AutoLayoutColumns="2">
<Grid.Resources>
<Style TargetType="ItemsControl">
<Setter Property="VerticalAlignment" Value="Center" />
Expand All @@ -313,21 +313,6 @@
</Style>
</Grid.Resources>

<Label Name="PART_ElemPlayTime" Content="{DynamicResource LOCTimePlayed}" />
<TextBlock Name="PART_TextPlayTime" />

<Label Name="PART_ElemLastPlayed" Content="{DynamicResource LOCLastPlayed}" />
<TextBlock Name="PART_TextLastActivity" />

<Label Name="PART_ElemCompletionStatus" Content="{DynamicResource LOCCompletionStatus}" />
<TextBlock Name="PART_TextCompletionStatus" />

<Label Name="PART_ElemLibrary" Content="{DynamicResource LOCGameProviderTitle}" />
<Button Name="PART_ButtonLibrary" />

<Label Name="PART_ElemCategories" Content="{DynamicResource LOCGameCategoriesTitle}" />
<ItemsControl Name="PART_ItemsCategories" />

<Label Name="PART_ElemVersion" Content="{DynamicResource LOCVersionLabel}" />
<Button Name="PART_ButtonVersion" VerticalAlignment="Center" />

Expand Down Expand Up @@ -382,9 +367,8 @@
<Setter Property="Margin" Value="0"/>
</Style>
</StackPanel.Resources>
<GridEx HorizontalAlignment="Center"
ColumnCount="6" RowCount="2" AutoLayoutColumns="6">
<Grid.Resources>
<WrapPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="20,0,20,0">
<WrapPanel.Resources>
<Style TargetType="ItemsControl">
<Setter Property="Margin" Value="10,0,10,0" />
<Setter Property="VerticalAlignment" Value="Top"/>
Expand All @@ -399,22 +383,42 @@
<Setter Property="Margin" Value="10,4,10,0" />
<Setter Property="VerticalAlignment" Value="Top"/>
</Style>
</Grid.Resources>
<Label Name="PART_ElemPlatform" Content="{DynamicResource LOCPlatformTitle}" />
<Label Name="PART_ElemReleaseDate" Content="{DynamicResource LOCGameReleaseDateTitle}" />
<Label Name="PART_ElemSeries" Content="{DynamicResource LOCSeriesLabel}" />
<Label Name="PART_ElemDevelopers" Content="{DynamicResource LOCDeveloperLabel}" />
<Label Name="PART_ElemPublishers" Content="{DynamicResource LOCPublisherLabel}" />
<Label Name="PART_ElemAgeRating" Content="{DynamicResource LOCAgeRatingLabel}" />

<Button Name="PART_ButtonPlatform"/>
<Button Name="PART_ButtonReleaseDate" />
<Button Name="PART_ButtonSeries" />
<ItemsControl Name="PART_ItemsDevelopers" />
<ItemsControl Name="PART_ItemsPublishers" />

<Button Name="PART_ButtonAgeRating" />
</GridEx>
<Style TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
<Setter Property="Margin" Value="10,4,10,0" />
<Setter Property="VerticalAlignment" Value="Top"/>
</Style>
</WrapPanel.Resources>
<GridEx HorizontalAlignment="Center" Margin="0,0,0,20"
ColumnCount="5" RowCount="2" AutoLayoutColumns="5">
<Label Name="PART_ElemLibrary" Content="{DynamicResource LOCGameProviderTitle}" />
<Label Name="PART_ElemCategories" Content="{DynamicResource LOCGameCategoriesTitle}" />
<Label Name="PART_ElemPlayTime" Content="{DynamicResource LOCTimePlayed}" />
<Label Name="PART_ElemLastPlayed" Content="{DynamicResource LOCLastPlayed}" />
<Label Name="PART_ElemCompletionStatus" Content="{DynamicResource LOCCompletionStatus}" />

<Button Name="PART_ButtonLibrary" />
<ItemsControl Name="PART_ItemsCategories" />
<TextBlock Name="PART_TextPlayTime" />
<TextBlock Name="PART_TextLastActivity" />
<TextBlock Name="PART_TextCompletionStatus" />
</GridEx>
<GridEx HorizontalAlignment="Center" Margin="0,0,0,20"
ColumnCount="6" RowCount="2" AutoLayoutColumns="6">
<Label Name="PART_ElemPlatform" Content="{DynamicResource LOCPlatformTitle}" />
<Label Name="PART_ElemReleaseDate" Content="{DynamicResource LOCGameReleaseDateTitle}" />
<Label Name="PART_ElemSeries" Content="{DynamicResource LOCSeriesLabel}" />
<Label Name="PART_ElemDevelopers" Content="{DynamicResource LOCDeveloperLabel}" />
<Label Name="PART_ElemPublishers" Content="{DynamicResource LOCPublisherLabel}" />
<Label Name="PART_ElemAgeRating" Content="{DynamicResource LOCAgeRatingLabel}" />

<Button Name="PART_ButtonPlatform"/>
<Button Name="PART_ButtonReleaseDate" />
<Button Name="PART_ButtonSeries" />
<ItemsControl Name="PART_ItemsDevelopers" />
<ItemsControl Name="PART_ItemsPublishers" />
<Button Name="PART_ButtonAgeRating" />
</GridEx>
</WrapPanel>
<StackPanel Margin="20,0,20,0" >
<StackPanel Tag="{DynamicResource Sc_EnableIntegrationInCustomTheme}">
<StackPanel.Style>
Expand Down Expand Up @@ -469,7 +473,7 @@
<StackPanel Name="PART_ScUserStats" MaxWidth="720"/>
</StackPanel>
</StackPanel>
<StackPanel Name="PART_ElemNotes" Margin="0,20,0,0">
<StackPanel Name="PART_ElemNotes" Margin="0,0,0,20">
<Grid HorizontalAlignment="Stretch" Margin="0,20,0,20" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
Expand All @@ -488,7 +492,7 @@
AcceptsReturn="True" TextWrapping="Wrap"
Margin="-1,5,-1,5" Padding="0"/>
</StackPanel>
<StackPanel Name="PART_ElemDescription" Margin="0,20,0,0">
<StackPanel Name="PART_ElemDescription" Margin="0,0,0,20">
<Grid HorizontalAlignment="Stretch" Margin="0,20,0,20" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
Expand Down
5 changes: 3 additions & 2 deletions theme.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ ThemeApiVersion: 1.9.0
Id: Magpie_Desktop
Name: Magpie
Author: Dan Davis
Version: 0.8.2
Version: 0.8.4
Constants:
- UseAbsoluteExtraMetadataPath: Use absolute path to your Playnite config folder.
- ExtraMetadataPath: That path; no ending backslash.
- AboutGameText: About the Game DIY Localization
- AboutGameText: About the Game DIY Localization.
- DetailsViewPanelWidth(640,2560): Width of main details view panel.
- TitleTextVisibility: Visibility of Title shown if missing logo.
- TitlebarBrush: Titlebar background.
- PanelBackgroundBrush: Side panels.
Expand Down

0 comments on commit 1800870

Please sign in to comment.