curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-06 08:38:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

musicplayer: adjusting positions for even gaps

Browse Source
This commit is contained in:
minjaesong
2024-01-04 01:22:45 +09:00
parent ccd36ffdbd
commit f2ecb109e6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt
View File

@@ -570,7 +570,7 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
private val PLAYLIST_LEFT_GAP = METERS_WIDTH.toInt() + maskOffWidth private val PLAYLIST_LEFT_GAP = METERS_WIDTH.toInt() + maskOffWidth
private val PLAYLIST_NAME_LEN = widthForList private val PLAYLIST_NAME_LEN = widthForList
private val PLAYLIST_LINE_HEIGHT = 28f 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 widthForMouseUp = (nameStrMaxLen + METERS_WIDTH + maskOffWidth).toInt()
private val heightThin = 28 private val heightThin = 28
@@ -669,7 +669,7 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
// print the album name // print the album name
batch.color = Color(1f, 1f, 1f, alpha * 0.75f) 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 internalWidth =minOf(widthForMouseUp.toFloat(), width - 20f)
val separation = internalWidth / 5f val separation = internalWidth / 5f
val anchorX = Toolkit.hdrawWidthf val anchorX = Toolkit.hdrawWidthf
val posY = posY + 10f val posY = posY + 12f
for (i in 0..4) { for (i in 0..4) {
batch.color = Color(1f, 1f, 1f, batch.color = Color(1f, 1f, 1f,
0.75f * (if (reverse) 1f - alpha0 else alpha0).pow(3f) + (playControlAnimAkku[i].pow(2f) * 1.2f) 0.75f * (if (reverse) 1f - alpha0 else alpha0).pow(3f) + (playControlAnimAkku[i].pow(2f) * 1.2f)