From 8cbd9dbfffead92340caefc567746bad4ba11069 Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Mon, 25 Dec 2023 22:52:49 +0900
Subject: [PATCH] musicplayer: actually repositioning the ui

---
 .../terrarum/musicplayer/gui/MusicPlayer.kt        | 14 ++++++++------
 src/net/torvald/terrarum/ui/UICanvas.kt            |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt b/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt
index 19dc65b22..952b16cbf 100644
--- a/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt
+++ b/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt
@@ -219,6 +219,8 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
         }
     }
 
+    override val mouseUp: Boolean
+        get() = (relativeMouseX) in -capsuleMosaicSize until width+capsuleMosaicSize && relativeMouseY in 0 until height
 
     override fun renderUI(batch: SpriteBatch, camera: OrthographicCamera) {
         batch.end()
@@ -226,13 +228,13 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
         batch.begin()
 
 
-        val posX = ((Toolkit.drawWidth - width) / 2).toFloat()
-        val posY = (App.scr.height - App.scr.tvSafeGraphicsHeight - height).toFloat()
+        posX = ((Toolkit.drawWidth - width) / 2)
+        posY = (App.scr.height - App.scr.tvSafeGraphicsHeight - height)
 
         blendNormalStraightAlpha(batch)
-        drawBaloon(batch, posX, posY, width.toFloat(), height - capsuleHeight.toFloat())
-        drawText(batch, posX, posY)
-        drawFreqMeter(batch, posX + width - 18, posY + height - (capsuleHeight / 2) + 1)
+        drawBaloon(batch, 0f, 0f, width.toFloat(), height - capsuleHeight.toFloat())
+        drawText(batch, 0f, 0f)
+        drawFreqMeter(batch, width - 18f, height - (capsuleHeight / 2) + 1f)
 
         batch.color = Color.WHITE
     }
@@ -240,7 +242,7 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
     private fun drawBaloon(batch: SpriteBatch, x: Float, y: Float, width: Float, height: Float) {
         val x = x - capsuleMosaicSize
         for (k in 0..3 step 3) {
-            batch.color = if (k == 0) colourEdge else colourBack
+            batch.color = if (k == 0) colourEdge else colourBack// (if (mouseUp) Color.MAROON else colourBack)
 
             // top left
             batch.draw(baloonTexture.get(k, 0), x, y)
diff --git a/src/net/torvald/terrarum/ui/UICanvas.kt b/src/net/torvald/terrarum/ui/UICanvas.kt
index f8e1ac6c6..162b6cb8b 100644
--- a/src/net/torvald/terrarum/ui/UICanvas.kt
+++ b/src/net/torvald/terrarum/ui/UICanvas.kt
@@ -113,7 +113,7 @@ abstract class UICanvas(
         get() = mouseUp && Terrarum.mouseDown
 
     private val _mouseUpThis: Boolean
-        get() = relativeMouseX in 0..width - 1 && relativeMouseY in 0..height - 1
+        get() = relativeMouseX in 0 until width && relativeMouseY in 0 until height
 
     /** Called by the screen */
     fun update(delta: Float) {