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
zcmV;z2|f0SP)<h;3K|Lk000e1NJLTq001Tc0012b1^@s6#(*Bc000L;dQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1ewk^;F7{MRYw2)4Y)K91LjcY}BQNx2FdXo{v_
zr~rc(NzRmP2^#<Z-=u%=a?vI7K~l^y8oYe=nG3!ov%T{Aw8pQ`_2RgX+53L7eIH<S
zIkay3DP^Bu&>wylTy)ra-%n{D;j{~~SHbJ$RI`5Xw??9$w|?t)L3wOnVoq{vYTX63
zed01@fBUOhTcf|}u0w!Q4^ZTohqKPC&$L<K^le>Pt$t?Av#SR)X?0yJ0U&qVyR^pK
z0(1xR<r_Vs-`sQXx$HCC1C~3BgfCAAY<TE*SN(je*j+8+`++%4`?a0@J!emIj%|0v
zM<5z^k6K{cix^C-fZVNR5s%;<@LkrE@g!4B1LYm+DxPMuWnewYdfRQW(~i|P+hC&S
z!Ge~#fhg@uPB=3F1VdgQJ6T+I-6e3?c#w1G=Bq7s>CH=Dvk98J#Z<NsX0hb(p;v=v
z9-33JwN}AwZefK_R=<WB%A9^;76`F(=PfLNFV9ZDxp6GGDi{n4=7bFvQ#TPc*dO0=
zi)V*<0qqt-mZa|j01<Qt7z4NW)<o-qjn)XWSPL8z2r96go#zS$YzW+8Bzxx~lW=0y
zjWuG|Tn-#ryKy#wh=5~Dz)f}qWO*OpKjIU7s00^$2q6Xui9!w~y69twF-p`!u80#a
zL86Ex$x@O_K7|yMq?B?hnX|(g7;?;#Q_i^*rUFF;vI^!G^i-~{`WkAiQd7;fG`LUm
zEwtFArIuUi++D{p(PNjMdhTUd8aOG2A7R8HBaJ-Dgs)9E{R}fsnQ7)(uB`2>{(4TZ
zW_Q+jF{Sh5${Kn}<RZfAaT1g>Fvi}3aZv`~(5#%9WW8r)PB}A~5fp)8WKeFXTV)Is
z`e8Xtd*$wjxwm+uklx~r|6-1my8nVX0(HN6d%{}Rd#;%+8Z`<PQ{xbQ!@)Qqo+ZsT
zQk=EO$QnP!&zhxs8RFvzGuWBCxBle_eX@unPC_?w6<_Mq6AcF&xNn(prq<-=XtQ>l
z+9pp|aXi=QWj3z072L!i?r27uw2$olaJ{3ok2BJ}P&%jgSS_8?d#sk8OzCFIPG&JW
zo29opikrCKk4ETt=-deHL!p!zT$vq*r!SgEjR8jth+S8ucQ~lViP44SSxZL)XWQR`
za+fjEZp`~8lFO-w8e$zac0UmOHqY2%tzvLF<T-FG)l^ErWn4=J9eCz&sba`up3=pZ
zit?3^Ka9i(`T|D5T@}HZ1!u@Qt%==Tq4(|~0AZv3wgof=m~*1rb?OLM`F!2B%IxcY
zsiXJw{jHAP)AzSJdQacq>gatqU#p|{;e4%*-iPzGI{Kxrz=K_>I9oAOkbF6uxy8la
zGj2vKGsqlMh^EIhQrO(FRDzBK0dU6%@zsACDs+hzxO^7~L_#FU^fcS+#)l{YiZu>Y
z?K<)_3~&iu0$~?G-^cxrppN3NE?c7NLNd3k>6<kQgIcrrIYxm#I58ek(8Nh&?H-Da
zgU1u$@BPtPK<;o*YnI=2T-i5JY}TB0h?QYjihc>;-kWI+AIO_gw>w<)+))#i1#(Ni
zbO^7NWjY)B2wE41l?uR-%b;yqECUxEvK0I(CaL>l56}JTN5XAO{$Sv(HXudQxPl?n
zwImFiC3&~xsaIhOF<&KIF-lw{AQ%a0jyHBlRxqAGfjkv8A<{6{n-_<x#EIlMv{Vey
zX^uKW>6ME938BOwe0YW}T`)Z~SZo&1sC7c_x{ERAEu1@;n*d5TlD=s-K^1v3Uu@B2
z-_*?(x7)HKy6jz$Dxmn<ud--^%B?iik2;ZGcXhv?<kXLj-q{(c$1fbNDCog<2f~3@
z{kcCn56F(gj)ErNXgocE;l{7-V0eiF{SCu=?m&<J@E!dJFr0A*It9cF9O%&>K6MBB
zK0Y=a=+PfObq9J10}hdh64gNz5(I-nO4eVHsF{&U_=?IptkVr;V9TgqD-&w6%s9M7
zTn}02#++wIW(zaiknOHOX^C1gguD`c+z(OuN^o;uyXliq!VS$a?ne4t-Kdsz57^#;
zV0#$=Yugx()YnRP(f)}on@)OEih}n+w0&!%^hEkc8>Rc5e!fw<-|6QYrB{@m*(klD
z^vp&HDrXvP^oZhr+Fm`Ufnrnt`}e{3`z!k9f`#8>Zp&_Ht(6FYE{PH1@OIp;8co)%
z3<Xh`Ls^>?<SZku${IVUk_EAoQ;8_yYC~n$6Sc9f-O|^Qk@P=`k(*|*yfz%Pf<p{*
z&FydoGAjD%*DPsSa=$h`pYbS^&gnf?OXu_+tEF>#kJZvSy~k?ldzd$&^gYbmQu-d|
zZ3cZ0^QM-*hj|l9-^08uCEUxHWabJ{q{awP<i{~qZ7i>#Ey9|>Y^PK#&DMmloi*pE
zVJofapT4OLvDxV@iqhue>znw$$d9o_>KQ=&3rcvaAKd?eM*si;glR)VP)S2WAaHVT
zW@&6?004NLeUUpz!%!54|E7u$DhhTGamY}eEJzh`)G8FALZ}s5buhW<3z{?}DK3tJ
zYr(<CV%5RLSyu;FK@fa^xVbqgx=4xVCWRI;UO3#3|K9)S+;ah;US^urF#%}0ZKe`&
zF_T>tyIvun2Ln_wnOVl1BqiayzU~p=`(2c0`QQ6<^{F|F0RfSCmKml^yg@v@X&apP
ziNmZYtHkHT<0dso{K$31<2TL)mj#{~Hq)tj;xMsTXk(>~S<%#pr-&n}rc=I<@mS@&
z#aSy?S+h_6!cb0MS>`&`2ohMt5+sOFP(=x4*oe}ulVTx7=W!qZu<Mt|rI4!xMvetk
zph0&1;D7LYwpM;J<|T#VK<A6&e2fBJyFjDnIN!&P(>MWw&%l-5@>lA>%qQu!mKHez
z`nQ3L>z1bM0hc?#(32sXvMU9tgnS-&KcjET0)w|e@0vHa<~dFufHci2c>^3A0%HZr
zUiW!-cl+G_z0;iE4?{e1l(9f<*Z=?k24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU
z01FcV0GgZ_00007bV*G`2jv0@5DElrF|(Ke0044HL_t(o!|j)$4!}SNLt&ZV$B_Nn
zll<7Zo7vnMPAnCzBqY2PL2&@q)fi)S`T=-%h6AuU=Q1KigkMG~fpvB7idFS1L}qH0
z0uz|Pj={PIS&q?yon$4gQeXlT7<;tdMO``eJ-n|&RENB(cpqL`Jtia-*L714U;qFB
M07*qoM6N<$f<e=+IRF3v

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();