diff --git a/core/assets/ui/square.png b/core/assets/ui/square.png index 5d78425193..38c5e6ce88 100644 Binary files a/core/assets/ui/square.png and b/core/assets/ui/square.png differ diff --git a/core/src/io/anuke/mindustry/ui/MenuButton.java b/core/src/io/anuke/mindustry/ui/MenuButton.java index d5c3e3e837..1e192190ef 100644 --- a/core/src/io/anuke/mindustry/ui/MenuButton.java +++ b/core/src/io/anuke/mindustry/ui/MenuButton.java @@ -1,19 +1,29 @@ package io.anuke.mindustry.ui; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.Colors; -import com.badlogic.gdx.utils.Align; -import com.badlogic.gdx.utils.Scaling; - +import com.badlogic.gdx.graphics.g2d.BitmapFont; +import io.anuke.ucore.UCore; +import io.anuke.ucore.core.Core; import io.anuke.ucore.function.Listenable; import io.anuke.ucore.scene.ui.Button; -import io.anuke.ucore.scene.ui.Image; +import io.anuke.ucore.scene.ui.layout.Unit; +import io.anuke.ucore.util.Bundles; public class MenuButton extends Button{ public MenuButton(String text, PressGroup group, Listenable clicked){ super("menu"); - add(text, "title", 4); + String style = "title"; + float scale = 4f; + BitmapFont font = Core.skin.getFont("title"); + for(char c : Bundles.get(text.substring(1)).toCharArray()){ + if(!font.getData().hasGlyph(c)){ + UCore.log("No glyph found: " + c); + style = "default"; + scale = Unit.dp.scl(1f); + break; + } + } + add(text, style, scale); clicked(clicked); group.add(this); } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java index 07d408dfec..9fba52ad60 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java @@ -31,7 +31,7 @@ public class HostDialog extends FloatingDialog{ content().row(); - content().addButton("Host", () -> { + content().addButton("$text.host", () -> { Vars.ui.loadfrag.show("$text.hosting"); Timers.runTask(5f, () -> { try{