From e88ff1a358500e11afaa0de64e18d95a6864484c Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 17 Jun 2020 15:07:20 -0400 Subject: [PATCH] Minor UI tweaks --- core/assets/bundles/bundle.properties | 1 - core/src/mindustry/mod/Scripts.java | 2 +- core/src/mindustry/ui/Styles.java | 6 +++- core/src/mindustry/ui/WarningBar.java | 33 +++++++++++++++++++ .../mindustry/ui/dialogs/PausedDialog.java | 2 +- core/src/mindustry/ui/dialogs/SaveDialog.java | 2 +- .../mindustry/ui/fragments/HudFragment.java | 2 +- .../ui/fragments/LoadingFragment.java | 19 ++++++----- 8 files changed, 52 insertions(+), 15 deletions(-) create mode 100644 core/src/mindustry/ui/WarningBar.java diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index ee2d1b0ebe..541b0d509c 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -224,7 +224,6 @@ save.new = New Save save.overwrite = Are you sure you want to overwrite\nthis save slot? overwrite = Overwrite save.none = No saves found! -saveload = Saving... savefail = Failed to save game! save.delete.confirm = Are you sure you want to delete this save? save.delete = Delete diff --git a/core/src/mindustry/mod/Scripts.java b/core/src/mindustry/mod/Scripts.java index b01b9856a3..8dbbe5761c 100644 --- a/core/src/mindustry/mod/Scripts.java +++ b/core/src/mindustry/mod/Scripts.java @@ -22,7 +22,7 @@ public class Scripts implements Disposable{ ".awt", "socket", "classloader", "oracle", "invoke", "arc.events", "java.util.function", "java.util.stream"); private final Seq whitelist = Seq.with("mindustry.net", "netserver", "netclient", "com.sun.proxy.$proxy", "mindustry.gen."); private final Context context; - private Scriptable scope; + private final Scriptable scope; private boolean errored; private LoadedMod currentMod = null; private Seq events = new Seq<>(); diff --git a/core/src/mindustry/ui/Styles.java b/core/src/mindustry/ui/Styles.java index 9e0fc1dcb5..d4838ae382 100644 --- a/core/src/mindustry/ui/Styles.java +++ b/core/src/mindustry/ui/Styles.java @@ -30,7 +30,7 @@ public class Styles{ public static ScrollPaneStyle defaultPane, horizontalPane, smallPane; public static KeybindDialogStyle defaultKeybindDialog; public static SliderStyle defaultSlider, vSlider; - public static LabelStyle defaultLabel, outlineLabel; + public static LabelStyle defaultLabel, outlineLabel, techLabel; public static TextFieldStyle defaultField, areaField; public static CheckBoxStyle defaultCheck; public static DialogStyle defaultDialog, fullDialog; @@ -268,6 +268,10 @@ public class Styles{ font = Fonts.outline; fontColor = Color.white; }}; + techLabel = new LabelStyle(){{ + font = Fonts.tech; + fontColor = Color.white; + }}; defaultField = new TextFieldStyle(){{ font = Fonts.chat; diff --git a/core/src/mindustry/ui/WarningBar.java b/core/src/mindustry/ui/WarningBar.java new file mode 100644 index 0000000000..1bb0579e41 --- /dev/null +++ b/core/src/mindustry/ui/WarningBar.java @@ -0,0 +1,33 @@ +package mindustry.ui; + +import arc.graphics.g2d.*; +import arc.scene.*; +import mindustry.graphics.*; + +public class WarningBar extends Element{ + public float barWidth = 40f, spacing = barWidth*2, skew = barWidth; + + { + setColor(Pal.accent); + } + + @Override + public void draw(){ + Draw.color(color); + Draw.alpha(parentAlpha); + + int amount = (int)(width / spacing) + 2; + + for(int i = 0; i < amount; i++){ + float rx = x + (i - 1)*spacing; + Fill.quad( + rx, y, + rx + skew, y + height, + rx + skew + barWidth, y + height, + rx + barWidth, y + ); + } + + Draw.color(); + } +} diff --git a/core/src/mindustry/ui/dialogs/PausedDialog.java b/core/src/mindustry/ui/dialogs/PausedDialog.java index 7b06ff6c4b..d05d15de83 100644 --- a/core/src/mindustry/ui/dialogs/PausedDialog.java +++ b/core/src/mindustry/ui/dialogs/PausedDialog.java @@ -120,7 +120,7 @@ public class PausedDialog extends BaseDialog{ return; } - ui.loadAnd("$saveload", () -> { + ui.loadAnd("$saving", () -> { try{ control.saves.getCurrent().save(); }catch(Throwable e){ diff --git a/core/src/mindustry/ui/dialogs/SaveDialog.java b/core/src/mindustry/ui/dialogs/SaveDialog.java index 9292e2527b..7b53850b54 100644 --- a/core/src/mindustry/ui/dialogs/SaveDialog.java +++ b/core/src/mindustry/ui/dialogs/SaveDialog.java @@ -44,7 +44,7 @@ public class SaveDialog extends LoadDialog{ void save(SaveSlot slot){ - ui.loadfrag.show("$saveload"); + ui.loadfrag.show("$saving"); Time.runTask(5f, () -> { hide(); diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java index 6148bd0ff9..a3382d43d7 100644 --- a/core/src/mindustry/ui/fragments/HudFragment.java +++ b/core/src/mindustry/ui/fragments/HudFragment.java @@ -308,7 +308,7 @@ public class HudFragment extends Fragment{ //'saving' indicator parent.fill(t -> { t.bottom().visible(() -> control.saves.isSaving()); - t.add("$saveload").style(Styles.outlineLabel); + t.add("$saving").style(Styles.outlineLabel); }); parent.fill(p -> { diff --git a/core/src/mindustry/ui/fragments/LoadingFragment.java b/core/src/mindustry/ui/fragments/LoadingFragment.java index 79c1455762..6da685e4ee 100644 --- a/core/src/mindustry/ui/fragments/LoadingFragment.java +++ b/core/src/mindustry/ui/fragments/LoadingFragment.java @@ -2,13 +2,12 @@ package mindustry.ui.fragments; import arc.func.*; import arc.graphics.*; -import arc.scene.Group; +import arc.scene.*; import arc.scene.actions.*; -import arc.scene.event.Touchable; -import arc.scene.ui.Label; -import arc.scene.ui.TextButton; -import arc.scene.ui.layout.Table; -import mindustry.graphics.Pal; +import arc.scene.event.*; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; +import mindustry.graphics.*; import mindustry.ui.*; public class LoadingFragment extends Fragment{ @@ -22,11 +21,13 @@ public class LoadingFragment extends Fragment{ t.visible(false); t.touchable(Touchable.enabled); t.add().height(133f).row(); - t.image().growX().height(3f).pad(4f).growX().get().setColor(Pal.accent); + //t.image().growX().height(3f).pad(4f).growX().get().setColor(Pal.accent); + t.add(new WarningBar()).growX().height(30f); t.row(); - t.add("$loading").name("namelabel").pad(10f); + t.add("$loading").name("namelabel").pad(10f).style(Styles.techLabel); t.row(); - t.image().growX().height(3f).pad(4f).growX().get().setColor(Pal.accent); + t.add(new WarningBar()).growX().height(30f); + //t.image().growX().height(3f).pad(4f).growX().get().setColor(Pal.accent); t.row(); bar = t.add(new Bar()).pad(3).size(500f, 40f).visible(false).get();