From f1917fea3e5b33ef7c09287aaf810db171209d72 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 15 Jul 2022 16:18:11 -0400 Subject: [PATCH] Misc formatting --- core/src/mindustry/core/Control.java | 2 -- core/src/mindustry/editor/MapObjectivesCanvas.java | 1 + core/src/mindustry/ui/Fonts.java | 6 +----- core/src/mindustry/ui/dialogs/ColorPicker.java | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java index eb9d6ade97..38152d2e4f 100644 --- a/core/src/mindustry/core/Control.java +++ b/core/src/mindustry/core/Control.java @@ -275,9 +275,7 @@ public class Control implements ApplicationListener, Loadable{ } private void placeLandBuild(Building build){ - //TODO instance reuse bad? build.tile.setBlock(build.block, build.team, build.rotation, () -> build); - //TODO dropped bad? build.dropped(); Fx.coreBuildBlock.at(build.x, build.y, 0f, build.block); diff --git a/core/src/mindustry/editor/MapObjectivesCanvas.java b/core/src/mindustry/editor/MapObjectivesCanvas.java index 1126a3dfa4..e564b6a95d 100644 --- a/core/src/mindustry/editor/MapObjectivesCanvas.java +++ b/core/src/mindustry/editor/MapObjectivesCanvas.java @@ -384,6 +384,7 @@ public class MapObjectivesCanvas extends WidgetGroup{ row().table(Tex.buttonSelectTrans, t -> { t.labelWrap(obj.typeName()).grow() + .style(Styles.outlineLabel) .color(Pal.accent).align(Align.left).padLeft(6f) .ellipsis(true).get().setAlignment(Align.left); diff --git a/core/src/mindustry/ui/Fonts.java b/core/src/mindustry/ui/Fonts.java index 2596292bfb..629b4b73b6 100644 --- a/core/src/mindustry/ui/Fonts.java +++ b/core/src/mindustry/ui/Fonts.java @@ -35,11 +35,7 @@ public class Fonts{ private static TextureRegion[] iconTable; private static int lastCid; - public static Font def; - public static Font outline; - public static Font icon; - public static Font iconLarge; - public static Font tech; + public static Font def, outline, icon, iconLarge, tech; public static TextureRegion logicIcon(int id){ return iconTable[id]; diff --git a/core/src/mindustry/ui/dialogs/ColorPicker.java b/core/src/mindustry/ui/dialogs/ColorPicker.java index 7f15970bc8..97eb3ea13e 100644 --- a/core/src/mindustry/ui/dialogs/ColorPicker.java +++ b/core/src/mindustry/ui/dialogs/ColorPicker.java @@ -53,7 +53,7 @@ public class ColorPicker extends BaseDialog{ t.row(); - t.defaults().padBottom(6).width(400f).height(44f); + t.defaults().padBottom(6).width(370f).height(44f); t.stack(new Image(new TextureRegion(hueTex)), hSlider = new Slider(0f, 360f, 0.3f, false){{ setValue(h);