From ad0c1d72f3d984e7ecd2b4d463b266e1dbc5b242 Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Wed, 4 Oct 2023 15:46:38 +0900
Subject: [PATCH] fix: zoom-out text won't update lang; escmenu won't reset
 when scrolled from inventory

---
 .../torvald/terrarum/modulebasegame/ui/UIInventoryEscMenu.kt   | 2 ++
 src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt  | 1 -
 src/net/torvald/terrarum/modulebasegame/ui/UIScreenZoom.kt     | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryEscMenu.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryEscMenu.kt
index 1b22407bb..151dba0ea 100644
--- a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryEscMenu.kt
+++ b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryEscMenu.kt
@@ -92,6 +92,7 @@ class UIInventoryEscMenu(val full: UIInventoryFull) : UICanvas() {
 
     fun toInitScreen() {
         screen = 0
+        oldScreen = 0
     }
 
     init {
@@ -269,6 +270,7 @@ class UIInventoryEscMenu(val full: UIInventoryFull) : UICanvas() {
     override fun show() {
         UIItemInventoryItemGrid.tooltipShowing.clear()
         INGAME.setTooltipMessage(null)
+        toInitScreen()
     }
 
 
diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt
index 58414619d..eea45e15c 100644
--- a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt
+++ b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt
@@ -255,7 +255,6 @@ class UIInventoryFull(
                 INGAME.setTooltipMessage(null)
                 transitionPanel.forcePosition(2)
                 catBar.setSelectedPanel(2)
-                transitionalEscMenu.toInitScreen()
                 it.setAsOpen()
             }
             else if (it.isOpened)
diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIScreenZoom.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIScreenZoom.kt
index 281e7b7be..ad7a2816a 100644
--- a/src/net/torvald/terrarum/modulebasegame/ui/UIScreenZoom.kt
+++ b/src/net/torvald/terrarum/modulebasegame/ui/UIScreenZoom.kt
@@ -27,7 +27,8 @@ class UIScreenZoom : UICanvas(
         handler.allowESCtoClose = false
     }
 
-    val zoomText = "${getKeycapPC(handler.toggleKey!!)} ${Lang["GAME_ACTION_ZOOM_OUT"]}"
+    val zoomText: String
+        get() = "${getKeycapPC(handler.toggleKey!!)} ${Lang["GAME_ACTION_ZOOM_OUT"]}"
 
     override var width = App.fontGame.getWidth(zoomText)
     override var height = App.fontGame.lineHeight.toInt()