From 8380e6561b814a72244d50feb26fcfc3ce02f30f Mon Sep 17 00:00:00 2001
From: sharlottes <60801210+sharlottes@users.noreply.github.com>
Date: Fri, 28 May 2021 08:57:57 +0900
Subject: [PATCH] add cancel button

---
 assets/bundles/bundle.properties    |  3 +-
 assets/bundles/bundle_ko.properties |  3 +-
 src/UnitInfo/core/HudUi.java        | 53 ++++++++++++++++++++---------
 3 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/assets/bundles/bundle.properties b/assets/bundles/bundle.properties
index bdbd03a..fff8b7e 100644
--- a/assets/bundles/bundle.properties
+++ b/assets/bundles/bundle.properties
@@ -37,4 +37,5 @@ warning = displayed wave amount is too high! it may cause lags.
 #Hud
 hud.unit = Unit Info
 hud.wave = Wave Info
-hud.core = Core Info
\ No newline at end of file
+hud.core = Core Info
+hud.cancel = Cancelled
\ No newline at end of file
diff --git a/assets/bundles/bundle_ko.properties b/assets/bundles/bundle_ko.properties
index e3d84d8..23a72da 100644
--- a/assets/bundles/bundle_ko.properties
+++ b/assets/bundles/bundle_ko.properties
@@ -37,4 +37,5 @@ warning = 표시될 웨이브 수가 너무 많습니다! 많은 랙이 걸릴 
 #Hud
 hud.unit = 유닛 정보
 hud.wave = 단계 정보
-hud.core = 코어 정보
\ No newline at end of file
+hud.core = 코어 정보
+hud.cancel = 닫음
\ No newline at end of file
diff --git a/src/UnitInfo/core/HudUi.java b/src/UnitInfo/core/HudUi.java
index 5450e6c..2498807 100644
--- a/src/UnitInfo/core/HudUi.java
+++ b/src/UnitInfo/core/HudUi.java
@@ -97,12 +97,13 @@ public class HudUi {
             Table labelTable = new Table(t -> t.add(label).scaling(Scaling.fit).left().padRight(40 * 8f));
 
             table.table(t -> {
-                Button[] buttons = {null, null, null};
-                buttons[0] = t.button(Icon.units, Styles.clearToggleTransi, () -> {
+                Seq<Button> buttons = Seq.with(null, null, null, null);
+                buttons.items[0] = t.button(Icon.units, Styles.clearToggleTransi, () -> {
                     uiIndex = 0;
-                    buttons[0].setChecked(true);
-                    buttons[1].setChecked(false);
-                    buttons[2].setChecked(false);
+                    buttons.items[0].setChecked(true);
+                    buttons.items[1].setChecked(false);
+                    buttons.items[2].setChecked(false);
+                    buttons.items[3].setChecked(false);
                     label.setText(Core.bundle.get("hud.unit"));
                     addCoreTable();
                     addWaveTable();
@@ -110,16 +111,17 @@ public class HudUi {
                     addWeapon();
                     addUnitTable();
                     table.removeChild(baseTable);
-                    labelTable.setPosition(buttons[uiIndex].x, buttons[uiIndex].y);
+                    labelTable.setPosition(buttons.items[uiIndex].x, buttons.items[uiIndex].y);
                     baseTable = table.table(tt -> tt.stack(unitTable, coreTable, waveTable, labelTable).align(Align.left).left().visible(() -> settings.getBool("infoui"))).get();
                     a = 1f;
                 }).size(5*8f).get();
                 t.row();
-                buttons[1] = t.button(Icon.fileText, Styles.clearToggleTransi, () -> {
+                buttons.items[1] = t.button(Icon.fileText, Styles.clearToggleTransi, () -> {
                     uiIndex = 1;
-                    buttons[0].setChecked(false);
-                    buttons[1].setChecked(true);
-                    buttons[2].setChecked(false);
+                    buttons.items[0].setChecked(false);
+                    buttons.items[1].setChecked(true);
+                    buttons.items[2].setChecked(false);
+                    buttons.items[3].setChecked(false);
                     label.setText(Core.bundle.get("hud.wave"));
                     addCoreTable();
                     addWaveTable();
@@ -127,16 +129,17 @@ public class HudUi {
                     addWeapon();
                     addUnitTable();
                     table.removeChild(baseTable);
-                    labelTable.setPosition(buttons[uiIndex].x, buttons[uiIndex].y);
+                    labelTable.setPosition(buttons.items[uiIndex].x, buttons.items[uiIndex].y);
                     baseTable = table.table(tt -> tt.stack(unitTable, coreTable, waveTable, labelTable).align(Align.left).left().visible(() -> settings.getBool("infoui"))).get();
                     a = 1f;
                 }).size(5*8f).get();
                 t.row();
-                buttons[2] = t.button(Icon.commandRally, Styles.clearToggleTransi, () -> {
+                buttons.items[2] = t.button(Icon.commandRally, Styles.clearToggleTransi, () -> {
                     uiIndex = 2;
-                    buttons[0].setChecked(false);
-                    buttons[1].setChecked(false);
-                    buttons[2].setChecked(true);
+                    buttons.items[0].setChecked(false);
+                    buttons.items[1].setChecked(false);
+                    buttons.items[2].setChecked(true);
+                    buttons.items[3].setChecked(false);
                     label.setText(Core.bundle.get("hud.core"));
                     addCoreTable();
                     addWaveTable();
@@ -144,7 +147,25 @@ public class HudUi {
                     addWeapon();
                     addUnitTable();
                     table.removeChild(baseTable);
-                    labelTable.setPosition(buttons[uiIndex].x, buttons[uiIndex].y);
+                    labelTable.setPosition(buttons.items[uiIndex].x, buttons.items[uiIndex].y);
+                    baseTable = table.table(tt -> tt.stack(unitTable, coreTable, waveTable, labelTable).align(Align.left).left().visible(() -> settings.getBool("infoui"))).get();
+                    a = 1f;
+                }).size(5*8f).get();
+                t.row();
+                buttons.items[3] = t.button(Icon.cancel, Styles.clearToggleTransi, () -> {
+                    uiIndex = 3;
+                    buttons.items[0].setChecked(false);
+                    buttons.items[1].setChecked(false);
+                    buttons.items[2].setChecked(false);
+                    buttons.items[3].setChecked(true);
+                    label.setText(Core.bundle.get("hud.cancel"));
+                    addCoreTable();
+                    addWaveTable();
+                    addBars();
+                    addWeapon();
+                    addUnitTable();
+                    table.removeChild(baseTable);
+                    labelTable.setPosition(buttons.items[uiIndex].x, buttons.items[uiIndex].y);
                     baseTable = table.table(tt -> tt.stack(unitTable, coreTable, waveTable, labelTable).align(Align.left).left().visible(() -> settings.getBool("infoui"))).get();
                     a = 1f;
                 }).size(5*8f).get();