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)