From f2d5a80bd158ffd49c93d272e04083caa9bf0b44 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Sun, 9 Jun 2024 15:06:45 -0400
Subject: [PATCH] completes funk-305

---
 source/funkin/ui/freeplay/SongMenuItem.hx | 27 +++++++++++++++++------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/source/funkin/ui/freeplay/SongMenuItem.hx b/source/funkin/ui/freeplay/SongMenuItem.hx
index dc30b4345..7708b3bcf 100644
--- a/source/funkin/ui/freeplay/SongMenuItem.hx
+++ b/source/funkin/ui/freeplay/SongMenuItem.hx
@@ -219,7 +219,7 @@ class SongMenuItem extends FlxSpriteGroup
     favIconBlurred.visible = false;
     add(favIconBlurred);
 
-    favIcon = new FlxSprite(380, 40);
+    favIcon = new FlxSprite(favIconBlurred.x, favIconBlurred.y);
     favIcon.frames = Paths.getSparrowAtlas('freeplay/favHeart');
     favIcon.animation.addByPrefix('fav', 'favorite heart', 24, false);
     favIcon.animation.play('fav');
@@ -294,21 +294,34 @@ class SongMenuItem extends FlxSpriteGroup
     }
   }
 
-  // 255, 27 normal
-  // 220, 27 favourited
+  /**
+   * Checks whether the song is favorited, and/or has a rank, and adjusts the clipping
+   * for the scenario when the text could be too long
+   */
   public function checkClip():Void
   {
     var clipSize:Int = 290;
     var clipType:Int = 0;
 
-    if (ranking.visible == true) clipType += 1;
-    if (favIcon.visible == true) clipType = 2;
+    if (ranking.visible)
+    {
+      favIconBlurred.x = this.x + 370;
+      favIcon.x = favIconBlurred.x;
+      clipType += 1;
+    }
+    else
+    {
+      favIconBlurred.x = favIcon.x = this.x + 405;
+    }
+
+    if (favIcon.visible) clipType += 1;
+
     switch (clipType)
     {
       case 2:
-        clipSize = 220;
+        clipSize = 210;
       case 1:
-        clipSize = 255;
+        clipSize = 245;
     }
     songText.clipWidth = clipSize;
   }