diff --git a/ModuleComputers/ModuleComputers.iml b/ModuleComputers/ModuleComputers.iml index 38a169981..359770720 100644 --- a/ModuleComputers/ModuleComputers.iml +++ b/ModuleComputers/ModuleComputers.iml @@ -18,5 +18,6 @@ + \ No newline at end of file diff --git a/MusicPlayer/MusicPlayer.iml b/MusicPlayer/MusicPlayer.iml index 5451cdb4f..9ef5cccee 100644 --- a/MusicPlayer/MusicPlayer.iml +++ b/MusicPlayer/MusicPlayer.iml @@ -7,11 +7,12 @@ - + - + + \ No newline at end of file diff --git a/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt b/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt index a61088912..7490c680e 100644 --- a/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt +++ b/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt @@ -440,6 +440,11 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() { } } } + // click on the music title to return to MODE_MOUSE_UP + else if (mouseUp && relativeMouseY.toFloat() in _posY + height - capsuleHeight .. _posY + height && Terrarum.mouseDown && !transitionOngoing && mode > MODE_MOUSE_UP) { + playControlButtonLatched = true + transitionRequest = MODE_MOUSE_UP + } // unlatch the click latch else if (!Terrarum.mouseDown) { playControlButtonLatched = false diff --git a/TerrarumBuild.iml b/TerrarumBuild.iml index 2ee128eb3..b32b69d38 100644 --- a/TerrarumBuild.iml +++ b/TerrarumBuild.iml @@ -30,5 +30,6 @@ + \ No newline at end of file diff --git a/src/net/torvald/terrarum/MouseLatch.kt b/src/net/torvald/terrarum/MouseLatch.kt new file mode 100644 index 000000000..d74a9b3e0 --- /dev/null +++ b/src/net/torvald/terrarum/MouseLatch.kt @@ -0,0 +1,7 @@ +package net.torvald.terrarum + +/** + * Created by minjaesong on 2024-01-10. + */ +class MouseLatch { +} \ No newline at end of file