From f2ecb109e6a0173b8471dced3cec86f8cc885ec5 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Thu, 4 Jan 2024 01:22:45 +0900 Subject: [PATCH] musicplayer: adjusting positions for even gaps --- .../src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt b/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt index bdfa334dc..ca05e34e0 100644 --- a/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt +++ b/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt @@ -570,7 +570,7 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() { private val PLAYLIST_LEFT_GAP = METERS_WIDTH.toInt() + maskOffWidth private val PLAYLIST_NAME_LEN = widthForList private val PLAYLIST_LINE_HEIGHT = 28f - private val PLAYLIST_LINES = 8 + private val PLAYLIST_LINES = 7 private val widthForMouseUp = (nameStrMaxLen + METERS_WIDTH + maskOffWidth).toInt() private val heightThin = 28 @@ -669,7 +669,7 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() { // print the album name batch.color = Color(1f, 1f, 1f, alpha * 0.75f) - Toolkit.drawTextCentered(batch, App.fontGame, playlistName, width, x.roundToInt(), 4 + (y + PLAYLIST_LINE_HEIGHT * PLAYLIST_LINES * scale).roundToInt()) + Toolkit.drawTextCentered(batch, App.fontGame, playlistName, width, x.roundToInt(), 3 + (y + PLAYLIST_LINE_HEIGHT * PLAYLIST_LINES * scale).roundToInt()) } } @@ -724,7 +724,7 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() { val internalWidth =minOf(widthForMouseUp.toFloat(), width - 20f) val separation = internalWidth / 5f val anchorX = Toolkit.hdrawWidthf - val posY = posY + 10f + val posY = posY + 12f for (i in 0..4) { batch.color = Color(1f, 1f, 1f, 0.75f * (if (reverse) 1f - alpha0 else alpha0).pow(3f) + (playControlAnimAkku[i].pow(2f) * 1.2f)