From 7091236b4e626eea7fc58067ab9c09ed04573419 Mon Sep 17 00:00:00 2001
From: sharlottes <seeseafood@naver.com>
Date: Sun, 5 Jun 2022 01:39:15 +0900
Subject: [PATCH] layout cleanup

---
 src/informatis/SUtils.java               |  2 ++
 src/informatis/ui/window/UnitWindow.java |  2 --
 src/informatis/ui/window/Window.java     | 17 ++++++++---------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/informatis/SUtils.java b/src/informatis/SUtils.java
index 2cd8cf9..626043d 100644
--- a/src/informatis/SUtils.java
+++ b/src/informatis/SUtils.java
@@ -55,6 +55,8 @@ public class SUtils {
     }
 
     public static <T extends Number> String formatNumber(T number){
+        if(number instanceof Integer integ) return integ.toString();
+        if(number.longValue() % 10 == 0) return String.valueOf(number.intValue());
         return formatNumber(number, 1);
     }
     public static <T extends Number> String formatNumber(T number, int step){
diff --git a/src/informatis/ui/window/UnitWindow.java b/src/informatis/ui/window/UnitWindow.java
index 579b090..1a6706d 100644
--- a/src/informatis/ui/window/UnitWindow.java
+++ b/src/informatis/ui/window/UnitWindow.java
@@ -157,8 +157,6 @@ class UnitWindow extends Window {
                         getDrawable().draw(x, y, width, height);
                         ScissorStack.pop();
                     }
-
-                    Log.info("----------------------");
                 }
             };
             icon.addListener(new InputListener(){
diff --git a/src/informatis/ui/window/Window.java b/src/informatis/ui/window/Window.java
index 036f6a5..179ecbc 100644
--- a/src/informatis/ui/window/Window.java
+++ b/src/informatis/ui/window/Window.java
@@ -52,18 +52,18 @@ public class Window extends Table{
         table(t -> {
             // icon and title
             t.table(Tex.buttonEdge1, b -> {
-                b.top().left();
-                b.image(() -> icon == null ? Icon.none.getRegion() : icon.getRegion()).size(20f).padLeft(15).top().left();
+                b.left();
+                b.image(icon.getRegion()).size(20f).padLeft(15);
                 b.pane(Styles.noBarPane, p -> {
-                    p.top().left();
-                    p.labelWrap(() -> Core.bundle.get("window."+name+".name")).padLeft(20).top().left().get().setAlignment(Align.topLeft);
-                }).left().height(40f).growX().get().setScrollingDisabled(true, true);
-            }).maxHeight(40f).grow();
+                    p.left();
+                    p.add(Core.bundle.get("window."+name+".name")).padLeft(20);
+                }).grow().get().setScrollingDisabled(false, true);
+            }).grow();
             
             // exit button
             t.table(Tex.buttonEdge3, b -> {
                 b.button(Icon.cancel, Styles.emptyi, () -> shown = false);
-            }).maxHeight(40f).width(80f).growY();
+            }).width(80f).growY();
 
             // handles the dragging.
             t.touchable = Touchable.enabled;
@@ -88,8 +88,7 @@ public class Window extends Table{
                     lastY = v.y;
                 }
             });
-        }).top().height(40f).growX();
-        row();
+        }).height(6f*8).top().grow().row();
     }
 
     protected void bottomBar(){