From 36ecb45fb490fffdaf5f57f1b0d7144bd501f371 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 31 Jul 2022 13:59:31 -0400 Subject: [PATCH] Minor UI style tweaks --- core/assets-raw/sprites/ui/button-down.9.png | Bin 208 -> 326 bytes core/assets-raw/sprites/ui/button-over.9.png | Bin 212 -> 318 bytes core/src/mindustry/ui/Styles.java | 13 ++++++++++++- .../mindustry/ui/dialogs/CustomGameDialog.java | 2 +- core/src/mindustry/ui/dialogs/LoadDialog.java | 2 +- core/src/mindustry/ui/dialogs/MapsDialog.java | 2 +- .../world/blocks/units/Reconstructor.java | 10 +++------- .../world/blocks/units/UnitAssembler.java | 6 ++---- .../world/blocks/units/UnitFactory.java | 4 +--- 9 files changed, 21 insertions(+), 18 deletions(-) diff --git a/core/assets-raw/sprites/ui/button-down.9.png b/core/assets-raw/sprites/ui/button-down.9.png index 2e4808729f13f7e30e53ce8f7165babd97fa9f16..f566ef953450bbb410ef673aab4f5d784b898c4e 100644 GIT binary patch delta 299 zcmcb>c#LU+NGZx^prw85kHDJY5_^B3jQ*cN99Lz~fpk(f{~V^%K9?N`+$4 z_rc<&i4#?pNW7V!==|`%d1G2sQksjZQg({1aqtCsafXUJ`QJ{x7GlcG*#Cd$j0Gx9 zkD~gVWj}2>Xtcm;Z|Me~6@5KsGd4ALw7IFgmOj%U70R-%g1f$s^=Vb;P1ouPj8CiT zj0}v!TyOmHzhzMLb-U5xpou+dH+VGkPrv_DFO+Eg`tOq?U5U&qKEK=|YONpfB|3B3 zx#*48QfeiQm!_^1oz0k@nv-y9d7j#wSAWwqzq)L9R1yi0f6B5$PGdpoaiND*3mM*i zk}gnIp0xD4;q&|N)s2k0R61mCS?CbP0 Hl+XkK1~-Nw delta 180 zcmX@cbb)b#O8sOv)Lae7d<>+Es!BB zsG9xu%dFj9oX3t-y_~=F=+#6&4eocm#cr8}GZx^prw85kITc)B=-M6{lrc3SYT0*{OMvA0hq*{#r=?9J8X z<>`1*lf9=dfqS#NblLqAn-r!7UC>tg^=*y*(j|WNISe1_?ylWx+Oaq8KL3gZog9@1 zzVOVPClx^xEgv6A?t52P~#NB>z zgH1u@{{xu?5n^+Ggu6La8bxf73<#T+{waRZooa>imv)KnmU0Msw^#e@rCp+r<+$2& zJC^8dOfr73rN>_4cKXDEu5zYVUB1nm7c_heZaZALfMMV9Ll5=@G}LVMOIYXRXnS1D zX?C(P+xi(3J2NsKa|Z3Toh)O|ly@@u!czHEQ(uEDE{78g3=9mOu6{1-oD!M<26Tf% delta 184 zcmdnTbcJz(O8sn47srr_TW_x)IRS!>QzFXe9F*xqv4NGSOzAjF+e@CiboX#jToxy#oX>!6k4c&Du ztqV+csOyMaJ#3nIZ-v-8u5PER1vd;b6A#vLMz`0q@qCkW-u2Tk@xIrKcTBtFo8KiY stp4|Y`I6VZOtZD$JIy|_@HNAYkM1|yXNfFeU|?YIboFyt=akR{0BtZ;ZvX%Q diff --git a/core/src/mindustry/ui/Styles.java b/core/src/mindustry/ui/Styles.java index 77f5b0dec7..8f608edda3 100644 --- a/core/src/mindustry/ui/Styles.java +++ b/core/src/mindustry/ui/Styles.java @@ -24,7 +24,7 @@ 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, accentDrawable; + public static Drawable black, black9, black8, black6, black3, black5, grayPanel, none, flatDown, flatOver, accentDrawable; public static ButtonStyle defaultb, underlineb; @@ -32,6 +32,8 @@ public class Styles{ public static TextButtonStyle defaultt, /** Flat, square, opaque. */ flatt, + /** Flat, square, opaque, gray. */ + grayt, /** Flat, square, toggleable. */ flatTogglet, /** Flat, square, gray border.*/ @@ -102,6 +104,7 @@ public class Styles{ black5 = whiteui.tint(0f, 0f, 0f, 0.5f); black3 = whiteui.tint(0f, 0f, 0f, 0.3f); none = whiteui.tint(0f, 0f, 0f, 0f); + grayPanel = whiteui.tint(Pal.darkestGray); flatDown = createFlatDown(); flatOver = whiteui.tint(Color.valueOf("454545")); accentDrawable = whiteui.tint(Pal.accent); @@ -144,6 +147,14 @@ public class Styles{ down = flatOver; up = black; }}; + grayt = new TextButtonStyle(){{ + over = flatOver; + font = Fonts.def; + fontColor = Color.white; + disabledFontColor = Color.lightGray; + down = flatOver; + up = grayPanel; + }}; logict = new TextButtonStyle(){{ over = flatOver; font = Fonts.def; diff --git a/core/src/mindustry/ui/dialogs/CustomGameDialog.java b/core/src/mindustry/ui/dialogs/CustomGameDialog.java index 1e9055a8e9..fa96c0b050 100644 --- a/core/src/mindustry/ui/dialogs/CustomGameDialog.java +++ b/core/src/mindustry/ui/dialogs/CustomGameDialog.java @@ -40,7 +40,7 @@ public class CustomGameDialog extends BaseDialog{ float images = 146f; ImageButtonStyle style = new ImageButtonStyle(){{ - up = Styles.none; + up = Styles.grayPanel; down = Styles.flatOver; over = Styles.flatOver; disabled = Styles.none; diff --git a/core/src/mindustry/ui/dialogs/LoadDialog.java b/core/src/mindustry/ui/dialogs/LoadDialog.java index 7f3fa5662f..cf4ed6193b 100644 --- a/core/src/mindustry/ui/dialogs/LoadDialog.java +++ b/core/src/mindustry/ui/dialogs/LoadDialog.java @@ -103,7 +103,7 @@ public class LoadDialog extends BaseDialog{ any = true; - TextButton button = new TextButton("", Styles.flatt); + TextButton button = new TextButton("", Styles.grayt); button.getLabel().remove(); button.clearChildren(); diff --git a/core/src/mindustry/ui/dialogs/MapsDialog.java b/core/src/mindustry/ui/dialogs/MapsDialog.java index bc6655733d..a266eb7b93 100644 --- a/core/src/mindustry/ui/dialogs/MapsDialog.java +++ b/core/src/mindustry/ui/dialogs/MapsDialog.java @@ -180,7 +180,7 @@ public class MapsDialog extends BaseDialog{ mapTable.row(); } - TextButton button = mapTable.button("", Styles.flatt, () -> showMapInfo(map)).width(mapsize).pad(8).get(); + TextButton button = mapTable.button("", Styles.grayt, () -> showMapInfo(map)).width(mapsize).pad(8).get(); button.clearChildren(); button.margin(9); button.add(map.name()).width(mapsize - 18f).center().get().setEllipsis(true); diff --git a/core/src/mindustry/world/blocks/units/Reconstructor.java b/core/src/mindustry/world/blocks/units/Reconstructor.java index e3cc5a7068..43fc6e2bf2 100644 --- a/core/src/mindustry/world/blocks/units/Reconstructor.java +++ b/core/src/mindustry/world/blocks/units/Reconstructor.java @@ -77,9 +77,8 @@ public class Reconstructor extends UnitBlock{ table.row(); for(var upgrade : upgrades){ if(upgrade[0].unlockedNow() && upgrade[1].unlockedNow()){ - table.table(Tex.whiteui, t -> { + table.table(Styles.grayPanel, t -> { t.left(); - t.setColor(Pal.darkestGray); t.image(upgrade[0].uiIcon).size(40).pad(10f).left(); t.table(info -> { @@ -88,16 +87,13 @@ public class Reconstructor extends UnitBlock{ }).pad(10).left(); }).fill().padTop(5).padBottom(5); - table.table(t -> { - t.setBackground(Tex.whiteui); - t.setColor(Pal.darkestGray); + table.table(Styles.grayPanel, t -> { t.image(Icon.right).color(Pal.darkishGray).size(40).pad(10f); }).fill().padTop(5).padBottom(5); - table.table(Tex.whiteui, t -> { + table.table(Styles.grayPanel, t -> { t.left(); - t.setColor(Pal.darkestGray); t.image(upgrade[1].uiIcon).size(40).pad(10f).right(); t.table(info -> { diff --git a/core/src/mindustry/world/blocks/units/UnitAssembler.java b/core/src/mindustry/world/blocks/units/UnitAssembler.java index 676fcd0b9f..c686a2cf1f 100644 --- a/core/src/mindustry/world/blocks/units/UnitAssembler.java +++ b/core/src/mindustry/world/blocks/units/UnitAssembler.java @@ -136,9 +136,7 @@ public class UnitAssembler extends PayloadBlock{ int tier = 0; for(var plan : plans){ int ttier = tier; - table.table(t -> { - t.setBackground(Tex.whiteui); - t.setColor(Pal.darkestGray); + table.table(Styles.grayPanel, t -> { if(plan.unit.isBanned()){ t.image(Icon.cancel).color(Pal.remove).size(40).pad(10); @@ -146,7 +144,7 @@ public class UnitAssembler extends PayloadBlock{ } if(plan.unit.unlockedNow()){ - t.image(plan.unit.uiIcon).size(40).pad(10f).left(); + t.image(plan.unit.uiIcon).scaling(Scaling.fit).size(40).pad(10f).left(); t.table(info -> { info.defaults().left(); info.add(plan.unit.localizedName); diff --git a/core/src/mindustry/world/blocks/units/UnitFactory.java b/core/src/mindustry/world/blocks/units/UnitFactory.java index ce1afc67f1..9bd2acc453 100644 --- a/core/src/mindustry/world/blocks/units/UnitFactory.java +++ b/core/src/mindustry/world/blocks/units/UnitFactory.java @@ -109,9 +109,7 @@ public class UnitFactory extends UnitBlock{ table.row(); for(var plan : plans){ - table.table(t -> { - t.setBackground(Tex.whiteui); - t.setColor(Pal.darkestGray); + table.table(Styles.grayPanel, t -> { if(plan.unit.isBanned()){ t.image(Icon.cancel).color(Pal.remove).size(40);