Reset UI scale to 100% when broken
This commit is contained in:
@@ -431,6 +431,11 @@ public class Vars implements Loadable{
|
|||||||
settings.setAutosave(false);
|
settings.setAutosave(false);
|
||||||
settings.load();
|
settings.load();
|
||||||
|
|
||||||
|
//https://github.com/Anuken/Mindustry/issues/8483
|
||||||
|
if(settings.getInt("uiscale") == 5){
|
||||||
|
settings.put("uiscale", 100);
|
||||||
|
}
|
||||||
|
|
||||||
Scl.setProduct(Math.max(settings.getInt("uiscale", 100), 25) / 100f);
|
Scl.setProduct(Math.max(settings.getInt("uiscale", 100), 25) / 100f);
|
||||||
|
|
||||||
if(!loadLocales) return;
|
if(!loadLocales) return;
|
||||||
|
|||||||
@@ -1433,7 +1433,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
|
|||||||
l.left();
|
l.left();
|
||||||
for(Item item : content.items()){
|
for(Item item : content.items()){
|
||||||
if(flowItems.hasFlowItem(item)){
|
if(flowItems.hasFlowItem(item)){
|
||||||
l.image(item.uiIcon).padRight(3f);
|
l.image(item.uiIcon).scaling(Scaling.fit).padRight(3f);
|
||||||
l.label(() -> flowItems.getFlowRate(item) < 0 ? "..." : Strings.fixed(flowItems.getFlowRate(item), 1) + ps).color(Color.lightGray);
|
l.label(() -> flowItems.getFlowRate(item) < 0 ? "..." : Strings.fixed(flowItems.getFlowRate(item), 1) + ps).color(Color.lightGray);
|
||||||
l.row();
|
l.row();
|
||||||
}
|
}
|
||||||
@@ -1463,7 +1463,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
|
|||||||
l.left();
|
l.left();
|
||||||
for(var liquid : content.liquids()){
|
for(var liquid : content.liquids()){
|
||||||
if(liquids.hasFlowLiquid(liquid)){
|
if(liquids.hasFlowLiquid(liquid)){
|
||||||
l.image(liquid.uiIcon).padRight(3f);
|
l.image(liquid.uiIcon).scaling(Scaling.fit).size(32f).padRight(3f);
|
||||||
l.label(() -> liquids.getFlowRate(liquid) < 0 ? "..." : Strings.fixed(liquids.getFlowRate(liquid), 1) + ps).color(Color.lightGray);
|
l.label(() -> liquids.getFlowRate(liquid) < 0 ? "..." : Strings.fixed(liquids.getFlowRate(liquid), 1) + ps).color(Color.lightGray);
|
||||||
l.row();
|
l.row();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -794,7 +794,7 @@ public class HudFragment{
|
|||||||
if(!obj.qualified()) continue;
|
if(!obj.qualified()) continue;
|
||||||
|
|
||||||
String text = obj.text();
|
String text = obj.text();
|
||||||
if(text != null){
|
if(text != null && !text.isEmpty()){
|
||||||
if(!first) builder.append("\n[white]");
|
if(!first) builder.append("\n[white]");
|
||||||
builder.append(text);
|
builder.append(text);
|
||||||
|
|
||||||
@@ -802,7 +802,10 @@ public class HudFragment{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return builder;
|
//TODO: display standard status when empty objective?
|
||||||
|
if(builder.length() > 0){
|
||||||
|
return builder;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!state.rules.waves && state.rules.attackMode){
|
if(!state.rules.waves && state.rules.attackMode){
|
||||||
|
|||||||
Reference in New Issue
Block a user