From e40e5e6a99d49cb15fd38e589492d9c0c74635a0 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 29 Nov 2018 09:22:39 -0500 Subject: [PATCH] UI fix --- core/assets-raw/sprites/ui/button-left-down.9.png | Bin 266 -> 0 bytes core/assets-raw/sprites/ui/button-left-over.9.png | Bin 281 -> 0 bytes core/assets-raw/sprites/ui/button-left.9.png | Bin 277 -> 0 bytes .../anuke/mindustry/ui/fragments/HudFragment.java | 8 ++++++-- 4 files changed, 6 insertions(+), 2 deletions(-) delete mode 100644 core/assets-raw/sprites/ui/button-left-down.9.png delete mode 100644 core/assets-raw/sprites/ui/button-left-over.9.png delete mode 100644 core/assets-raw/sprites/ui/button-left.9.png diff --git a/core/assets-raw/sprites/ui/button-left-down.9.png b/core/assets-raw/sprites/ui/button-left-down.9.png deleted file mode 100644 index a8d4d637d24ade94d51217aef938297f706c510c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 266 zcmeAS@N?(olHy`uVBq!ia0y~yU{GUVV36ftV_;x7)*yF)fq{W7$=lt9;Xep2*t>i( z0|NtRfk$L90|U1(2s1Lwnj^u$z`$PO>Fdh=h+9TbT;ZnQ5|9DYJzX3_A`ZWuevtQo z0*C9u!a3`joOgK4UE=&g{armn7C*n-P>$ zp?@*@y{+DYkSyV1*^hrWCw*S9=7_k|(fhoq!Bd()MuvZLjFdQWP|J+>RCV~HF8&L< zikc!TkEMT&UCgzn?bB~I?c-S*U*(mjM(pNbWcYF8)Van^#YOj;!`JGm-_<<-t7yh6 Q1_lNOPgg&ebxsLQ042g^R{#J2 diff --git a/core/assets-raw/sprites/ui/button-left-over.9.png b/core/assets-raw/sprites/ui/button-left-over.9.png deleted file mode 100644 index e6727f11bd8bd350c231c76be0e65c6636d9050b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 281 zcmeAS@N?(olHy`uVBq!ia0y~yU{GUVV36ftV_;x7)*yF)fq{W7$=lt9;Xep2*t>i( z0|NtRfk$L90|U1(2s1Lwnj^u$z`$PO>Fdh=h+9TbTukhX;d}-LhGm{Ejv*0;lfQiZ znyMh0b8pX2d(Bt1wY8F-Tbo-WT4&$t5$MY_R=O%T$>vdbY2U=o#0gD~uMNZ&EzUPN z(iRmWBwB05>lw1~uh-!{7gsFF3b|zZ%dJ>-?V_U3&(8iYyjEM%x9{SLB^p`_bC>>S z;XZIN#?s}Lms`_XUn}?586iQ7S-qpS^tn9^c+n#uy4HlLhlhuU=fD2-;JufmdKI;Vst03%arrT_o{ diff --git a/core/assets-raw/sprites/ui/button-left.9.png b/core/assets-raw/sprites/ui/button-left.9.png deleted file mode 100644 index a3e813eefba51c0da2e3674abee532e0b0df23fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 277 zcmeAS@N?(olHy`uVBq!ia0y~yU{GUVV36ftV_;x7)*yF)fq{W7$=lt9;Xep2*t>i( z0|NtRfk$L90|U1(2s1Lwnj^u$z`$PO>Fdh=h+9TbOygXiY$*c+!y-=?$B>A_Z?9W( z9Z=w5xUj53R{Z@$xfR}pA05ux?)u{JGU!E!&xd9wBkoSS9zlV^i)?}$(`=QR%-SdG z*#!US@^qZ-zI9^m{)AYz-bC)=Bs=SkH#Jmi9w=Y&IQRXaTjbPD>htfON}J+xq&`1B z-)^zaqMCHobEXHne6MQE-Zyo^Y%}kOr8RDm)lH!rqnhVFGFD2=6mdKI;Vst02}0FT>t<8 diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java index 6e09a4c468..bc94461864 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java @@ -24,9 +24,13 @@ import io.anuke.ucore.scene.Element; import io.anuke.ucore.scene.Group; import io.anuke.ucore.scene.actions.Actions; import io.anuke.ucore.scene.event.Touchable; -import io.anuke.ucore.scene.ui.*; +import io.anuke.ucore.scene.ui.Image; +import io.anuke.ucore.scene.ui.ImageButton; +import io.anuke.ucore.scene.ui.Label; +import io.anuke.ucore.scene.ui.TextButton; import io.anuke.ucore.scene.ui.layout.Stack; import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.ucore.scene.ui.layout.Unit; import io.anuke.ucore.util.Bundles; import io.anuke.ucore.util.Mathf; @@ -347,7 +351,7 @@ public class HudFragment extends Fragment{ if(shown){ shown = false; blockfrag.toggle(dur, in); - wavetable.actions(Actions.translateBy(0, (wavetable.getHeight() + dsize + 6) - wavetable.getTranslation().y, dur, in)); + wavetable.actions(Actions.translateBy(0, (wavetable.getHeight() + dsize + Unit.dp.scl(6)) - wavetable.getTranslation().y, dur, in)); infolabel.actions(Actions.translateBy(0, (wavetable.getHeight()) - wavetable.getTranslation().y, dur, in)); }else{ shown = true;