external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'core/master' into newmaster

Browse Source
This commit is contained in:
Anthony Calosa
2022-08-01 15:39:53 +08:00
parent b3e4e4013f f840bd118f
commit e739198e98
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-gui-android/src/forge/app/Main.java
View File

@@ -4,6 +4,8 @@ import java.io.File;
import java.io.InputStream;
import java.io.OutputStream;
import android.graphics.Point;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Version;
import com.badlogic.gdx.backends.android.AndroidApplication;
@@ -447,12 +449,13 @@ public class Main extends AndroidApplication {
WindowManager windowManager = (WindowManager) getApplicationContext().getSystemService(Context.WINDOW_SERVICE);
Display display = windowManager.getDefaultDisplay();
Point size = new Point();
if (real)
/*if (real)
display.getRealSize(size);
else
display.getSize(size);
//real size
return Pair.of(size.x, size.y);
return Pair.of(size.x, size.y);*/ //method works only on Build.VERSION.SDK_INT >= 17 (4.2), need to update android dependency from 4.1.1.4 to at least 8.0
return Pair.of(Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
}
}

1
forge-gui-mobile-dev/src/forge/app/Main.java
View File

@@ -13,6 +13,7 @@ import forge.util.OperatingSystem;
import forge.util.RestartUtil;
import forge.util.Utils;
import org.apache.commons.cli.*;
import org.apache.commons.lang3.tuple.Pair;
import javax.imageio.ImageIO;
import java.awt.*;