Reverted single file publish and fixed issue with AchievementsView.

syntax-tm · Nov 25, 2023 · e722674 · e722674
1 parent 107fa20
commit e722674
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 23 deletions.
diff --git a/src/SAM.Core/Stats/SteamAchievement.cs b/src/SAM.Core/Stats/SteamAchievement.cs
@@ -90,11 +90,11 @@ public void RefreshDescription(bool forceShow = false)
         {
             if (forceShow)
             {
-                Description = AchievementDefinition.Description;
+                Description = FullDescription;
                 return;
             }
 
-            Description = AchievementDefinition.IsHidden && !IsAchieved ? @"Hidden" : AchievementDefinition.Description;
+            Description = AchievementDefinition.IsHidden && !IsAchieved ? @"Hidden" : FullDescription;
         }
 
         public void Unlock()

diff --git a/src/SAM.Core/Views/Stats/AchievementsView.xaml b/src/SAM.Core/Views/Stats/AchievementsView.xaml
@@ -3,24 +3,20 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:dxmvvm="http://schemas.devexpress.com/winfx/2008/xaml/mvvm"
              xmlns:vm="clr-namespace:SAM.Core.ViewModels"
              xmlns:stats="clr-namespace:SAM.Core.Stats"
              xmlns:converters="clr-namespace:SAM.Core.Converters"
-             xmlns:views="clr-namespace:SAM.Core.Views"
              xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800"
-             d:DataContext="{d:DesignInstance Type={x:Type vm:SteamGameViewModel}, IsDesignTimeCreatable=False}">
+             d:DataContext="{d:DesignInstance Type={x:Type vm:SteamGameViewModel}}">
 
     <UserControl.Resources>
-
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/SAM.Core;component/Styles/AllResources.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
-
     </UserControl.Resources>
 
     <Grid>
@@ -83,20 +79,8 @@
                                 <Grid Grid.Row="1">
                                     <TextBlock HorizontalAlignment="Left" VerticalAlignment="Center"
                                                TextWrapping="Wrap" FontSize="{StaticResource SmallFontSize}"
-                                               Foreground="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGridRow}}, Path=Foreground}">
-                                        <TextBlock.Style>
-                                            <Style TargetType="{x:Type TextBlock}">
-                                                <Setter Property="Text" Value="{Binding Description}" />
-                                                <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type views:AchievementsView}}, Path=DataContext.
-                                                        }"
-                                                                 Value="True">
-                                                        <Setter Property="Text" Value="{Binding FullDescription}" />
-                                                    </DataTrigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </TextBlock.Style>
-                                    </TextBlock>
+                                               Text="{Binding Description}"
+                                               Foreground="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGridRow}}, Path=Foreground}" />
                                 </Grid>
                             </Grid>
                         </DataTemplate>

diff --git a/src/SAM.Manager/SAM.Manager.csproj b/src/SAM.Manager/SAM.Manager.csproj
@@ -10,7 +10,7 @@
     <ApplicationIcon>sam_manager.ico</ApplicationIcon>
     <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
     <ApplicationHighDpiMode>PerMonitorV2</ApplicationHighDpiMode>
-    <PublishSingleFile>true</PublishSingleFile>
+    <!--<PublishSingleFile>true</PublishSingleFile>-->
     <SelfContained>true</SelfContained>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

diff --git a/src/SAM/SAM.csproj b/src/SAM/SAM.csproj
@@ -10,7 +10,7 @@
     <ApplicationIcon>sam.ico</ApplicationIcon>
     <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
     <ApplicationHighDpiMode>PerMonitorV2</ApplicationHighDpiMode>
-    <PublishSingleFile>true</PublishSingleFile>
+    <!--<PublishSingleFile>true</PublishSingleFile>-->
     <SelfContained>true</SelfContained>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>