From 0d0aef3deadf3435e809549fb5c6a032d8f948bd Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 9 Feb 2021 12:10:15 -0500
Subject: [PATCH] Logic layout bugfixes

---
 core/assets-raw/sprites/ui/pane-solid.9.png   | Bin 0 -> 2498 bytes
 core/src/mindustry/logic/LStatement.java      |  21 ++++++++++---
 core/src/mindustry/logic/LStatements.java     |  28 +++++++++++++-----
 core/src/mindustry/ui/Styles.java             |  15 ++++++++--
 core/src/mindustry/ui/dialogs/ModsDialog.java |   4 +--
 5 files changed, 53 insertions(+), 15 deletions(-)
 create mode 100644 core/assets-raw/sprites/ui/pane-solid.9.png

diff --git a/core/assets-raw/sprites/ui/pane-solid.9.png b/core/assets-raw/sprites/ui/pane-solid.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7a6a53b36fb6233ddf3608a21007514df45c2ed
GIT binary patch
literal 2498
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
Q7#J8lUHx3vIVCg!0728PIRF3v

literal 0
HcmV?d00001

diff --git a/core/src/mindustry/logic/LStatement.java b/core/src/mindustry/logic/LStatement.java
index bf8637ac63..42d9915414 100644
--- a/core/src/mindustry/logic/LStatement.java
+++ b/core/src/mindustry/logic/LStatement.java
@@ -62,10 +62,10 @@ public abstract class LStatement{
         showSelectTable(b, (t, hide) -> {
             ButtonGroup<Button> group = new ButtonGroup<>();
             int i = 0;
-            t.defaults().size(56f, 40f);
+            t.defaults().size(60f, 38f);
 
             for(T p : values){
-                sizer.get(t.button(p.toString(), Styles.clearTogglet, () -> {
+                sizer.get(t.button(p.toString(), Styles.logicTogglet, () -> {
                     getter.get(p);
                     hide.run();
                 }).checked(current == p).group(group));
@@ -80,7 +80,18 @@ public abstract class LStatement{
     }
 
     protected void showSelectTable(Button b, Cons2<Table, Runnable> hideCons){
-        Table t = new Table(Tex.button);
+        Table t = new Table(Tex.paneSolid){
+            @Override
+            public float getPrefHeight(){
+                return Math.min(super.getPrefHeight(), Core.graphics.getHeight());
+            }
+
+            @Override
+            public float getPrefWidth(){
+                return Math.min(super.getPrefWidth(), Core.graphics.getWidth());
+            }
+        };
+        t.margin(4);
 
         //triggers events behind the element to simulate deselection
         Element hitter = new Element();
@@ -110,13 +121,15 @@ public abstract class LStatement{
             if(t.getWidth() > Core.scene.getWidth()) t.setWidth(Core.graphics.getWidth());
             if(t.getHeight() > Core.scene.getHeight()) t.setHeight(Core.graphics.getHeight());
             t.keepInStage();
+            t.invalidateHierarchy();
+            t.pack();
         });
         t.actions(Actions.alpha(0), Actions.fadeIn(0.3f, Interp.fade));
 
         t.top().pane(inner -> {
             inner.top();
             hideCons.get(inner, hide);
-        }).top();
+        }).pad(0f).top().get().setScrollingDisabled(true, false);
 
         t.pack();
     }
diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java
index 259bc8a10e..d61ada4a13 100644
--- a/core/src/mindustry/logic/LStatements.java
+++ b/core/src/mindustry/logic/LStatements.java
@@ -531,7 +531,7 @@ public class LStatements{
 
                             t.parent.parent.pack();
                             t.parent.parent.invalidateHierarchy();
-                        }).size(80f, 50f).growX().checked(selected == fi).group(group);
+                        }).height(50f).growX().checked(selected == fi).group(group);
                     }
                     t.row();
                     t.add(stack).colspan(3).width(240f).left();
@@ -610,11 +610,17 @@ public class LStatements{
 
                 //"function"-type operations have the name at the left and arguments on the right
                 if(op.func){
-                    opButton(table);
-
-                    field(table, a, str -> a = str);
-
-                    field(table, b, str -> b = str);
+                    if(LCanvas.useRows()){
+                        table.left();
+                        table.row();
+                        table.table(c -> {
+                            c.color.set(color());
+                            c.left();
+                            funcs(c);
+                        }).colspan(2).left();
+                    }else{
+                        funcs(table);
+                    }
                 }else{
                     field(table, a, str -> a = str);
 
@@ -625,6 +631,14 @@ public class LStatements{
             }
         }
 
+        void funcs(Table table){
+            opButton(table);
+
+            field(table, a, str -> a = str);
+
+            field(table, b, str -> b = str);
+        }
+
         void opButton(Table table){
             table.button(b -> {
                 b.label(() -> op.symbol);
@@ -632,7 +646,7 @@ public class LStatements{
                     op = o;
                     rebuild(table);
                 }));
-            }, Styles.logict, () -> {}).size(65f, 40f).pad(4f).color(table.color);
+            }, Styles.logict, () -> {}).size(64f, 40f).pad(4f).color(table.color);
         }
 
         @Override
diff --git a/core/src/mindustry/ui/Styles.java b/core/src/mindustry/ui/Styles.java
index bad2dbc5a7..ff234bf4c4 100644
--- a/core/src/mindustry/ui/Styles.java
+++ b/core/src/mindustry/ui/Styles.java
@@ -24,9 +24,9 @@ import static mindustry.gen.Tex.*;
 @StyleDefaults
 public class Styles{
     //TODO all these names are inconsistent and not descriptive
-    public static Drawable black, black9, black8, black6, black3, black5, none, flatDown, flatOver;
+    public static Drawable black, black9, black8, black6, black3, black5, none, flatDown, flatOver, accentDrawable;
     public static ButtonStyle defaultb, waveb, modsb;
-    public static TextButtonStyle defaultt, squaret, nodet, cleart, discordt, nonet, infot, clearPartialt, clearTogglet, clearToggleMenut, togglet, transt, fullTogglet, logict;
+    public static TextButtonStyle defaultt, squaret, nodet, cleart, discordt, nonet, infot, clearPartialt, clearTogglet, logicTogglet, clearToggleMenut, togglet, transt, fullTogglet, logict;
     public static ImageButtonStyle defaulti, nodei, righti, emptyi, emptytogglei, selecti, logici, geni, colori, accenti, cleari, clearFulli, clearPartiali, clearPartial2i, clearTogglei, clearTransi, clearToggleTransi, clearTogglePartiali;
     public static ScrollPaneStyle defaultPane, horizontalPane, smallPane;
     public static KeybindDialogStyle defaultKeybindDialog;
@@ -46,6 +46,7 @@ public class Styles{
         none = whiteui.tint(0f, 0f, 0f, 0f);
         flatDown = createFlatDown();
         flatOver = whiteui.tint(Color.valueOf("454545"));
+        accentDrawable = whiteui.tint(Pal.accent);
 
         defaultb = new ButtonStyle(){{
             down = buttonDown;
@@ -151,6 +152,16 @@ public class Styles{
             disabled = black;
             disabledFontColor = Color.gray;
         }};
+        logicTogglet = new TextButtonStyle(){{
+            font = Fonts.outline;
+            fontColor = Color.white;
+            checked = accentDrawable;
+            down = accentDrawable;
+            up = black;
+            over = flatOver;
+            disabled = black;
+            disabledFontColor = Color.gray;
+        }};
         clearToggleMenut = new TextButtonStyle(){{
             font = Fonts.def;
             fontColor = Color.white;
diff --git a/core/src/mindustry/ui/dialogs/ModsDialog.java b/core/src/mindustry/ui/dialogs/ModsDialog.java
index f7008ce96f..3e3525bc77 100644
--- a/core/src/mindustry/ui/dialogs/ModsDialog.java
+++ b/core/src/mindustry/ui/dialogs/ModsDialog.java
@@ -38,7 +38,7 @@ public class ModsDialog extends BaseDialog{
 
     private String searchtxt = "";
     private @Nullable Seq<ModListing> modList;
-    private boolean orderDate = true;
+    private boolean orderDate = false;
     private BaseDialog currentContent;
 
     private BaseDialog browser;
@@ -384,7 +384,7 @@ public class ModsDialog extends BaseDialog{
 
                         }).tooltip(c.localizedName);
 
-                        if(++i % Math.min(Core.graphics.getWidth() / Scl.scl(70), 14) == 0) cs.row();
+                        if(++i % Math.min(Core.graphics.getWidth() / Scl.scl(110), 14) == 0) cs.row();
                     }
                 }).grow();
                 d.addCloseButton();