From b1887b953bdb7ea8817a29b82a4e87bb4bfe7b28 Mon Sep 17 00:00:00 2001 From: yugecin Date: Tue, 11 Oct 2016 11:22:32 +0200 Subject: [PATCH] add fullscreen option, close #17 --- src/itdelatrisu/opsu/Options.java | 21 +++++++++++--------- src/itdelatrisu/opsu/states/OptionsMenu.java | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/itdelatrisu/opsu/Options.java b/src/itdelatrisu/opsu/Options.java index 98f374a2..de2d1097 100644 --- a/src/itdelatrisu/opsu/Options.java +++ b/src/itdelatrisu/opsu/Options.java @@ -302,7 +302,7 @@ public class Options { } catch (IllegalArgumentException ignored) {} } }, -// FULLSCREEN ("Fullscreen Mode", "Fullscreen", "Restart to apply changes.", false), + FULLSCREEN ("Fullscreen Mode", "Fullscreen", "Restart to apply changes.", false), SKIN ("Skin", "Skin", "Restart (Ctrl+Shift+F5) to apply skin changes.") { @Override public String getValueString() { return skinName; } @@ -1457,6 +1457,7 @@ public class Options { try { app.setDisplayMode(resolution.getWidth(), resolution.getHeight(), false); + app.setFullscreen(isFullscreen()); } catch (SlickException e) { ErrorHandler.error("Failed to set display mode.", e, true); } @@ -1464,16 +1465,18 @@ public class Options { 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)); + if (!isFullscreen()) { + // 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)); + } } -// /** -// * Returns whether or not fullscreen mode is enabled. -// * @return true if enabled -// */ -// public static boolean isFullscreen() { return fullscreen; } + /** + * Returns whether or not fullscreen mode is enabled. + * @return true if enabled + */ + public static boolean isFullscreen() { return GameOption.FULLSCREEN.getBooleanValue(); } /** * Returns whether or not the FPS counter display is enabled. diff --git a/src/itdelatrisu/opsu/states/OptionsMenu.java b/src/itdelatrisu/opsu/states/OptionsMenu.java index adc72e56..08e4c9e2 100644 --- a/src/itdelatrisu/opsu/states/OptionsMenu.java +++ b/src/itdelatrisu/opsu/states/OptionsMenu.java @@ -56,7 +56,7 @@ public class OptionsMenu extends BasicGameState { private enum OptionTab { DISPLAY ("Display", new GameOption[] { GameOption.SCREEN_RESOLUTION, -// GameOption.FULLSCREEN, + GameOption.FULLSCREEN, GameOption.SKIN, GameOption.TARGET_FPS, GameOption.SHOW_FPS,