Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved russian glyphs, made menu buttons fallback

Browse Source
This commit is contained in:
Anuken
2018-01-16 15:17:21 -05:00
parent 1e63236cc4
commit 6ba1f117bd
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/ui/square.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

24
core/src/io/anuke/mindustry/ui/MenuButton.java
View File

@@ -1,19 +1,29 @@
package io.anuke.mindustry.ui; package io.anuke.mindustry.ui;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.Colors; import io.anuke.ucore.UCore;
import com.badlogic.gdx.utils.Align; import io.anuke.ucore.core.Core;
import com.badlogic.gdx.utils.Scaling;
import io.anuke.ucore.function.Listenable; import io.anuke.ucore.function.Listenable;
import io.anuke.ucore.scene.ui.Button; 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 class MenuButton extends Button{
public MenuButton(String text, PressGroup group, Listenable clicked){ public MenuButton(String text, PressGroup group, Listenable clicked){
super("menu"); 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); clicked(clicked);
group.add(this); group.add(this);
} }

2
core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java
View File

@@ -31,7 +31,7 @@ public class HostDialog extends FloatingDialog{
content().row(); content().row();
content().addButton("Host", () -> { content().addButton("$text.host", () -> {
Vars.ui.loadfrag.show("$text.hosting"); Vars.ui.loadfrag.show("$text.hosting");
Timers.runTask(5f, () -> { Timers.runTask(5f, () -> {
try{ try{