From 828e6bb1b7adfa1e55da93fd3e7b90fcfcd2e536 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 10 Jun 2019 13:55:18 -0400
Subject: [PATCH] New changes, possible fixes to UI layout bugs

---
 core/src/io/anuke/mindustry/core/UI.java               |  3 ++-
 core/src/io/anuke/mindustry/ui/Minimap.java            | 10 ++++------
 .../io/anuke/mindustry/ui/dialogs/DatabaseDialog.java  |  4 +---
 core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java |  2 +-
 .../mindustry/ui/fragments/BlockInventoryFragment.java |  4 ++--
 .../io/anuke/mindustry/ui/fragments/HudFragment.java   |  4 +++-
 6 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java
index ef57acaa8b..376758f59e 100644
--- a/core/src/io/anuke/mindustry/core/UI.java
+++ b/core/src/io/anuke/mindustry/core/UI.java
@@ -15,6 +15,7 @@ import io.anuke.arc.scene.*;
 import io.anuke.arc.scene.actions.Actions;
 import io.anuke.arc.scene.ui.*;
 import io.anuke.arc.scene.ui.TextField.TextFieldFilter;
+import io.anuke.arc.scene.ui.Tooltip.Tooltips;
 import io.anuke.arc.scene.ui.layout.Table;
 import io.anuke.arc.scene.ui.layout.Unit;
 import io.anuke.arc.util.*;
@@ -92,7 +93,7 @@ public class UI implements ApplicationListener{
             )
         ));
 
-        TooltipManager.getInstance().animations = false;
+        Tooltips.getInstance().animations = false;
 
         Core.settings.setErrorHandler(e -> {
             e.printStackTrace();
diff --git a/core/src/io/anuke/mindustry/ui/Minimap.java b/core/src/io/anuke/mindustry/ui/Minimap.java
index e39e128e3e..a0e4811660 100644
--- a/core/src/io/anuke/mindustry/ui/Minimap.java
+++ b/core/src/io/anuke/mindustry/ui/Minimap.java
@@ -5,19 +5,18 @@ import io.anuke.arc.graphics.g2d.Draw;
 import io.anuke.arc.input.KeyCode;
 import io.anuke.arc.scene.Element;
 import io.anuke.arc.scene.event.*;
-import io.anuke.arc.scene.ui.layout.Container;
-import io.anuke.arc.scene.ui.layout.Unit;
+import io.anuke.arc.scene.ui.layout.*;
 
 import static io.anuke.mindustry.Vars.*;
 
-public class Minimap extends Container<Element>{
+public class Minimap extends Table{
 
     public Minimap(){
         background("pane");
         float margin = 5f;
         touchable(Touchable.enabled);
 
-        addChild(new Element(){
+        add(new Element(){
             {
                 setSize(Unit.dp.scl(140f));
             }
@@ -39,9 +38,8 @@ public class Minimap extends Container<Element>{
                     renderer.minimap.drawEntities(x, y, width, height);
                 }
             }
-        });
+        }).size(140f);
 
-        size(140f);
         margin(margin);
 
         addListener(new InputListener(){
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java
index e4565db51b..8dcc63cc19 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java
@@ -59,9 +59,7 @@ public class DatabaseDialog extends FloatingDialog{
 
                     if(unlocked(unlock)){
                         image.clicked(() -> Vars.ui.content.show(unlock));
-                        image.addListener(new Tooltip<>(new Table("button"){{
-                            add(unlock.localizedName());
-                        }}));
+                        image.addListener(new Tooltip(t -> t.add(unlock.localizedName())));
                     }
 
                     if((++count) % maxWidth == 0){
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
index cf4555aa66..bf876e9c4b 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
@@ -230,7 +230,7 @@ public class JoinDialog extends FloatingDialog{
 
             Cell cell = ((Table)pane.getParent()).getCell(button);
 
-            if(!Mathf.isEqual(cell.getMinWidth(), pw)){
+            if(!Mathf.isEqual(cell.minWidth(), pw)){
                 cell.width(pw);
                 cell.padLeft(pad);
                 pane.getParent().invalidateHierarchy();
diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java
index d0a86d0f3c..4092fbd804 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java
@@ -115,8 +115,8 @@ public class BlockInventoryFragment extends Fragment{
         int cols = 3;
         int row = 0;
 
-        table.margin(6f);
-        table.defaults().size(8 * 5).space(8f);
+        table.margin(4f);
+        table.defaults().size(8 * 5).pad(4f);
 
         if(tile.block().hasItems){
 
diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
index 61e7216799..4a044323c5 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
@@ -143,7 +143,9 @@ public class HudFragment extends Fragment{
 
             Table wavesMain, editorMain;
 
-            cont.stack(wavesMain = new Table(), editorMain = new Table()).height(e -> wavesMain.isVisible() ? wavesMain.getPrefHeight() : editorMain.getPrefHeight());
+            cont.stack(wavesMain = new Table(), editorMain = new Table()).height(wavesMain.getPrefHeight()).update(s -> {
+                ((Table)s.getParent()).getCell(s).height(wavesMain.isVisible() ? wavesMain.getPrefHeight() : editorMain.getPrefHeight());
+            });
 
             {
                 wavesMain.visible(() -> shown && !state.isEditor());