Merge branch 'dancestuff' into dancesettings

This commit is contained in:
yugecin
2016-09-27 21:45:43 +02:00
30 changed files with 1190 additions and 63 deletions

View File

@@ -801,6 +801,9 @@ public class Options {
/** Current screen resolution. */
private static Resolution resolution = Resolution.RES_1024_768;
public static int width;
public static int height;
/** The available skin directories. */
private static String[] skinDirs;
@@ -919,6 +922,9 @@ public class Options {
ErrorHandler.error("Failed to set display mode.", e, true);
}
width = resolution.width;
height = resolution.height;
// set borderless window if dimensions match screen size
boolean borderless = (screenWidth == resolution.getWidth() && screenHeight == resolution.getHeight());
System.setProperty("org.lwjgl.opengl.Window.undecorated", Boolean.toString(borderless));