mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-15 10:17:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed SDL crash

Browse Source
This commit is contained in:
Anuken
2019-07-25 12:46:31 -04:00
parent 518bffe644
commit d02d419729
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/editor/MapEditorDialog.java
View File

@ -371,7 +371,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
float amount = 10f, baseSize = 60f; float amount = 10f, baseSize = 60f;
float size = mobile ? (int)(Math.min(Core.graphics.getHeight(), Core.graphics.getWidth()) / amount / Unit.dp.scl(1f)) : float size = mobile ? (int)(Math.min(Core.graphics.getHeight(), Core.graphics.getWidth()) / amount / Unit.dp.scl(1f)) :
Math.min(Core.graphics.getDisplayMode().height / amount, baseSize); Math.min(Core.graphics.getHeight() / amount, baseSize);
clearChildren(); clearChildren();
table(cont -> { table(cont -> {

25
core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java
View File

@ -1,18 +1,19 @@
package io.anuke.mindustry.ui.dialogs; package io.anuke.mindustry.ui.dialogs;
import io.anuke.arc.Core; import io.anuke.arc.*;
import io.anuke.arc.graphics.Color; import io.anuke.arc.graphics.*;
import io.anuke.arc.input.KeyCode; import io.anuke.arc.input.*;
import io.anuke.arc.scene.event.Touchable; import io.anuke.arc.math.*;
import io.anuke.arc.scene.event.*;
import io.anuke.arc.scene.ui.*; import io.anuke.arc.scene.ui.*;
import io.anuke.arc.scene.ui.layout.Table; import io.anuke.arc.scene.ui.layout.*;
import io.anuke.arc.util.Scaling; import io.anuke.arc.util.*;
import io.anuke.mindustry.Vars; import io.anuke.mindustry.*;
import io.anuke.mindustry.core.Platform; import io.anuke.mindustry.core.*;
import io.anuke.mindustry.graphics.*; import io.anuke.mindustry.graphics.*;
import io.anuke.mindustry.io.MapIO; import io.anuke.mindustry.io.*;
import io.anuke.mindustry.maps.Map; import io.anuke.mindustry.maps.*;
import io.anuke.mindustry.ui.BorderImage; import io.anuke.mindustry.ui.*;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;
@ -108,7 +109,7 @@ public class MapsDialog extends FloatingDialog{
ScrollPane pane = new ScrollPane(maps); ScrollPane pane = new ScrollPane(maps);
pane.setFadeScrollBars(false); pane.setFadeScrollBars(false);
int maxwidth = Core.graphics.isPortrait() ? 2 : 4; int maxwidth = Mathf.clamp((int)(Core.graphics.getWidth() / Unit.dp.scl(230)), 1, 8);
float mapsize = 200f; float mapsize = 200f;
int i = 0; int i = 0;