mirror of
https://github.com/Anuken/Mindustry.git
synced 2024-09-22 13:57:46 +03:00
Fixed some font problems
This commit is contained in:
parent
17939dabff
commit
b645d5abfb
@ -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.TooltipManager;
|
||||
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.ucore.scene.actions.Actions.*;
|
||||
@ -69,11 +70,13 @@ public class UI extends SceneModule{
|
||||
fadeOut(0.1f, Interpolation.fade)
|
||||
)
|
||||
));
|
||||
|
||||
skin.font().setUseIntegerPositions(false);
|
||||
skin.font().getData().setScale(Vars.fontscale);
|
||||
skin.font().getData().down += 4f;
|
||||
skin.font().getData().lineHeight -= 2f;
|
||||
|
||||
Mathf.each(font -> {
|
||||
font.setUseIntegerPositions(false);
|
||||
font.getData().setScale(Vars.fontscale);
|
||||
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;
|
||||
|
||||
|
@ -7,6 +7,7 @@ import com.badlogic.gdx.graphics.g2d.BitmapFont;
|
||||
import com.badlogic.gdx.graphics.g2d.GlyphLayout;
|
||||
import com.badlogic.gdx.utils.Align;
|
||||
import com.badlogic.gdx.utils.Array;
|
||||
import io.anuke.mindustry.Mindustry;
|
||||
import io.anuke.mindustry.Vars;
|
||||
import io.anuke.mindustry.core.GameState;
|
||||
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().font = skin.getFont("default-font-chat");
|
||||
|
||||
Mindustry.platforms.addDialog(chatfield);
|
||||
|
||||
bottom().left().marginBottom(offsety).marginLeft(offsetx*2).add(fieldlabel).padBottom(4f);
|
||||
|
||||
add(chatfield).padBottom(offsety).padLeft(offsetx).growX().padRight(offsetx).height(28);
|
||||
@ -87,8 +90,9 @@ public class ChatFragment extends Table implements Fragment{
|
||||
if(chatOpen)
|
||||
batch.draw(skin.getRegion("white"), offsetx, chatfield.getY(), Gdx.graphics.getWidth()-offsetx*2, chatfield.getHeight()-1);
|
||||
|
||||
font.getData().down = -21.5f;
|
||||
font.getData().lineHeight = 22f;
|
||||
//font.getData().down = -21.5f;
|
||||
// font.getData().lineHeight = 22f;
|
||||
//chatfield.getStyle().font.getData().setScale(Vars.fontscale);
|
||||
|
||||
super.draw(batch, alpha);
|
||||
|
||||
|
@ -65,6 +65,7 @@ public class HudFragment implements Fragment{
|
||||
pause = new imagebutton("icon-pause", isize, ()->{
|
||||
if(Net.active() && Vars.android){
|
||||
//TODO open android chat
|
||||
ui.chatfrag.toggle();
|
||||
}else {
|
||||
GameState.set(GameState.is(State.paused) ? State.playing : State.paused);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user