From 8d1d2a1e1023b1dea34ab799d04615ec6f7f1a0d Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Mon, 25 Dec 2023 00:07:59 +0900
Subject: [PATCH] fix: ui width will not take the length truncation

---
 .../net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt b/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt
index d80fa9654..33bd112b5 100644
--- a/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt
+++ b/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt
@@ -71,7 +71,7 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
 
         // test code
         val diskJockeyingMode = "continuous" // must be read from the playlist.json
-        registerPlaylist(App.customDir + "/MusicShort", false, diskJockeyingMode)
+        registerPlaylist(App.customDir + "/MusicFJ", false, diskJockeyingMode)
     }
 
     fun registerPlaylist(path: String, shuffled: Boolean, diskJockeyingMode: String) {
@@ -102,11 +102,12 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
 
     private fun setMusicName(str: String) {
         currentMusicName = str
-        nameLength = App.fontGameFBO.getWidth(str)
-        TRANSITION_LENGTH = 0.8f * ((nameLength.coerceAtMost(nameStrMaxLen).toFloat() - nameLengthOld).absoluteValue / nameStrMaxLen)
+        val realNameLength = App.fontGameFBO.getWidth(str)
+        nameLength = realNameLength.coerceAtMost(nameStrMaxLen)
+        TRANSITION_LENGTH = 0.8f * ((nameLength - nameLengthOld).absoluteValue / nameStrMaxLen)
         nameOverflown = (nameLength > nameStrMaxLen)
 
-//        printdbg(this, "setMusicName $str; strLen = $nameLengthOld -> $nameLength; overflown=$nameOverflown; transitionTime=$TRANSITION_LENGTH")
+        printdbg(this, "setMusicName $str; strLen = $nameLengthOld -> $nameLength; overflown=$nameOverflown; transitionTime=$TRANSITION_LENGTH")
     }
 
     override fun updateUI(delta: Float) {