From d257adf0c1448ecc232a4eb088ac74722b17a41c Mon Sep 17 00:00:00 2001 From: Matthew Peng <54301439+MEEPofFaith@users.noreply.github.com> Date: Tue, 7 Sep 2021 12:20:59 -0700 Subject: [PATCH] Show All (#5954) --- core/assets/bundles/bundle.properties | 1 + core/src/mindustry/editor/WaveGraph.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index b16bdbdcfa..8b4a050c05 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -402,6 +402,7 @@ waves.sort.begin = Begin waves.sort.health = Health waves.sort.type = Type waves.units.hide = Hide All +waves.units.show = Show All #these are intentionally in lower case wavemode.counts = counts diff --git a/core/src/mindustry/editor/WaveGraph.java b/core/src/mindustry/editor/WaveGraph.java index dc7dc6f112..af80ab18d6 100644 --- a/core/src/mindustry/editor/WaveGraph.java +++ b/core/src/mindustry/editor/WaveGraph.java @@ -181,7 +181,7 @@ public class WaveGraph extends Table{ colors.clear(); colors.left(); - colors.button("@waves.units.hide", Styles.fullTogglet, () -> { + colors.button("@waves.units.hide", Styles.cleart, () -> { if(hidden.size == usedCopy.size){ hidden.clear(); }else{ @@ -191,7 +191,7 @@ public class WaveGraph extends Table{ used.clear(); used.addAll(usedCopy); for(UnitType o : hidden) used.remove(o); - }).update(b -> b.setChecked(hidden.size == usedCopy.size)).height(32f).width(130f); + }).update(b -> b.setText(hidden.size == usedCopy.size ? "@waves.units.show" : "@waves.units.hide")).height(32f).width(130f); colors.pane(t -> { t.left(); for(UnitType type : used){