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

Fixed some font problems

Browse Source
This commit is contained in:
Anuken
2018-01-06 14:40:33 -05:00
parent 17939dabff
commit b645d5abfb
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/io/anuke/mindustry/core/UI.java
View File

@@ -22,6 +22,7 @@ import io.anuke.ucore.scene.ui.TextField;
import io.anuke.ucore.scene.ui.TextField.TextFieldFilter; import io.anuke.ucore.scene.ui.TextField.TextFieldFilter;
import io.anuke.ucore.scene.ui.TooltipManager; import io.anuke.ucore.scene.ui.TooltipManager;
import io.anuke.ucore.scene.ui.layout.Unit; import io.anuke.ucore.scene.ui.layout.Unit;
import io.anuke.ucore.util.Mathf;
import static io.anuke.mindustry.Vars.control; import static io.anuke.mindustry.Vars.control;
import static io.anuke.ucore.scene.actions.Actions.*; import static io.anuke.ucore.scene.actions.Actions.*;
@@ -70,10 +71,12 @@ public class UI extends SceneModule{
) )
)); ));
skin.font().setUseIntegerPositions(false); Mathf.each(font -> {
skin.font().getData().setScale(Vars.fontscale); font.setUseIntegerPositions(false);
skin.font().getData().down += 4f; font.getData().setScale(Vars.fontscale);
skin.font().getData().lineHeight -= 2f; font.getData().down += Unit.dp.scl(4f);
font.getData().lineHeight -= Unit.dp.scl(2f);
}, skin.font(), skin.getFont("default-font-chat"));
TooltipManager.getInstance().animations = false; TooltipManager.getInstance().animations = false;

8
core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java
View File

@@ -7,6 +7,7 @@ import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.g2d.GlyphLayout; import com.badlogic.gdx.graphics.g2d.GlyphLayout;
import com.badlogic.gdx.utils.Align; import com.badlogic.gdx.utils.Align;
import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Array;
import io.anuke.mindustry.Mindustry;
import io.anuke.mindustry.Vars; import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.GameState; import io.anuke.mindustry.core.GameState;
import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.core.GameState.State;
@@ -74,6 +75,8 @@ public class ChatFragment extends Table implements Fragment{
chatfield.getStyle().fontColor = Color.WHITE; chatfield.getStyle().fontColor = Color.WHITE;
chatfield.getStyle().font = skin.getFont("default-font-chat"); chatfield.getStyle().font = skin.getFont("default-font-chat");
Mindustry.platforms.addDialog(chatfield);
bottom().left().marginBottom(offsety).marginLeft(offsetx*2).add(fieldlabel).padBottom(4f); bottom().left().marginBottom(offsety).marginLeft(offsetx*2).add(fieldlabel).padBottom(4f);
add(chatfield).padBottom(offsety).padLeft(offsetx).growX().padRight(offsetx).height(28); add(chatfield).padBottom(offsety).padLeft(offsetx).growX().padRight(offsetx).height(28);
@@ -87,8 +90,9 @@ public class ChatFragment extends Table implements Fragment{
if(chatOpen) if(chatOpen)
batch.draw(skin.getRegion("white"), offsetx, chatfield.getY(), Gdx.graphics.getWidth()-offsetx*2, chatfield.getHeight()-1); batch.draw(skin.getRegion("white"), offsetx, chatfield.getY(), Gdx.graphics.getWidth()-offsetx*2, chatfield.getHeight()-1);
font.getData().down = -21.5f; //font.getData().down = -21.5f;
font.getData().lineHeight = 22f; // font.getData().lineHeight = 22f;
//chatfield.getStyle().font.getData().setScale(Vars.fontscale);
super.draw(batch, alpha); super.draw(batch, alpha);

1
core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
View File

@@ -65,6 +65,7 @@ public class HudFragment implements Fragment{
pause = new imagebutton("icon-pause", isize, ()->{ pause = new imagebutton("icon-pause", isize, ()->{
if(Net.active() && Vars.android){ if(Net.active() && Vars.android){
//TODO open android chat //TODO open android chat
ui.chatfrag.toggle();
}else { }else {
GameState.set(GameState.is(State.paused) ? State.playing : State.paused); GameState.set(GameState.is(State.paused) ? State.playing : State.paused);
} }