From 8e98ab4651e9445db28a74eaf1ae16475737a6ad Mon Sep 17 00:00:00 2001
From: Hyper <34012267+hyperbx@users.noreply.github.com>
Date: Mon, 9 Dec 2024 18:45:44 +0000
Subject: [PATCH] achievement_menu: always fade long descriptions

---
 UnleashedRecomp/ui/achievement_menu.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/UnleashedRecomp/ui/achievement_menu.cpp b/UnleashedRecomp/ui/achievement_menu.cpp
index 450e519..e81c941 100644
--- a/UnleashedRecomp/ui/achievement_menu.cpp
+++ b/UnleashedRecomp/ui/achievement_menu.cpp
@@ -226,11 +226,12 @@ static void DrawAchievement(int rowIndex, float yOffset, Achievement& achievemen
         colTextShadow
     );
 
+    ImVec2 marqueeMin = { textMarqueeX, min.y };
+
+    SetMarqueeFade(marqueeMin, max, Scale(32));
+
     if (isSelected && textX + textSize.x >= max.x - Scale(10))
     {
-        ImVec2 marqueeMin = { textMarqueeX, min.y };
-        SetMarqueeFade(marqueeMin, max, Scale(32.0f));
-
         // Draw achievement description with marquee.
         DrawTextWithMarqueeShadow
         (
@@ -239,17 +240,15 @@ static void DrawAchievement(int rowIndex, float yOffset, Achievement& achievemen
             { textX, min.y + descTextY },
             marqueeMin,
             max,
-            isUnlocked ? IM_COL32(255, 255, 255, 255) : colLockedText,
+            isUnlocked ? IM_COL32_WHITE : colLockedText,
             desc,
             g_rowSelectionTime,
             0.9,
-            Scale(250.0),
+            Scale(250),
             shadowOffset,
             0.4f,
             colTextShadow
         );
-
-        ResetMarqueeFade();
     }
     else
     {
@@ -259,7 +258,7 @@ static void DrawAchievement(int rowIndex, float yOffset, Achievement& achievemen
             g_fntSeurat,
             fontSize,
             { textX, min.y + descTextY },
-            isUnlocked ? IM_COL32(255, 255, 255, 255) : colLockedText,
+            isUnlocked ? IM_COL32_WHITE : colLockedText,
             desc,
             shadowOffset,
             0.4f,
@@ -267,6 +266,8 @@ static void DrawAchievement(int rowIndex, float yOffset, Achievement& achievemen
         );
     }
 
+    ResetMarqueeFade();
+
     drawList->PopClipRect();
 
     if (!isUnlocked)