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

musicplayer: albumlist wip

Browse Source
This commit is contained in:
minjaesong
2024-01-06 03:13:59 +09:00
parent 23df3ac02b
commit 96776ef1bb
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -399,7 +399,7 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
} }
} }
// make playlist clicking work // make playlist clicking work
else if (!playControlButtonLatched && mouseOnList != null && Terrarum.mouseDown) { else if (listViewPanelScroll == 1f && !playControlButtonLatched && mouseOnList != null && Terrarum.mouseDown) {
playControlButtonLatched = true playControlButtonLatched = true
val index = playlistScroll + mouseOnList!! val index = playlistScroll + mouseOnList!!
val list = songsInGovernor val list = songsInGovernor
@@ -416,6 +416,13 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
} }
} }
} }
// make album list clicking work
else if (listViewPanelScroll == 0f && !playControlButtonLatched && mouseOnList != null && Terrarum.mouseDown) {
playControlButtonLatched = true
val index = albumlistScroll + mouseOnList!!
val list = albumsList//.map { albumPropCache[it] }
}
// unlatch the click latch // unlatch the click latch
else if (!Terrarum.mouseDown) { else if (!Terrarum.mouseDown) {
playControlButtonLatched = false playControlButtonLatched = false

5
src/net/torvald/terrarum/Principii.java
View File

@@ -8,7 +8,10 @@ import java.io.IOException;
import java.util.*; import java.util.*;
/** /**
* Bootstrapper that launches the bundled JVM and injects VM configs such as -Xmx * The headless launcher for the game.
*
* The launcher retrieves the information about the host operating system, and reads the `config.json`
* to set up the flags for the JVM then launches the main game.
* *
* Created by minjaesong on 2023-06-22. * Created by minjaesong on 2023-06-22.
*/ */