diff --git a/src/de/bricked/game/settings/GameSize.java b/src/de/bricked/game/settings/GameSize.java index 92c05987cf189cd772c0034c02d80da3d1e49374..a1481111b96936dd0a3fb04efb71ed2e965eaf13 100644 --- a/src/de/bricked/game/settings/GameSize.java +++ b/src/de/bricked/game/settings/GameSize.java @@ -1,14 +1,11 @@ package de.bricked.game.settings; -import java.awt.GraphicsDevice; -import java.awt.GraphicsEnvironment; public enum GameSize { SMALL(800, 600), NORMAL(1024, 768), BIGGER(1280, 1024), - BIG(1920, 1080), - FULL_SCREEN(); + BIG(1920, 1080); private int width; private int height; @@ -19,13 +16,6 @@ public enum GameSize this.height = height; } - GameSize() - { - GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice(); - this.width = gd.getDisplayMode().getWidth(); - this.height = gd.getDisplayMode().getHeight(); - } - public int getWidth() { return width; diff --git a/src/de/bricked/ui/LevelSelectController.java b/src/de/bricked/ui/LevelSelectController.java index 0ab0d5016bb26bfb522efa8b05f597a67092329e..05ff9d1a227b948daef35d188cb6f5baae41e51a 100644 --- a/src/de/bricked/ui/LevelSelectController.java +++ b/src/de/bricked/ui/LevelSelectController.java @@ -6,7 +6,6 @@ import java.util.ResourceBundle; import de.bricked.game.Game; import de.bricked.game.levels.Level; -import de.bricked.game.settings.GameSize; import de.bricked.ui.cells.LevelCell; import javafx.application.Platform; import javafx.collections.FXCollections; @@ -22,7 +21,6 @@ import javafx.scene.control.ListView; import javafx.scene.control.ScrollPane; import javafx.scene.control.ScrollPane.ScrollBarPolicy; import javafx.scene.image.Image; -import javafx.scene.input.KeyCombination; import javafx.scene.input.KeyEvent; import javafx.scene.input.MouseEvent; import javafx.scene.layout.AnchorPane; @@ -148,20 +146,8 @@ public class LevelSelectController FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/de/bricked/ui/LevelGUI.fxml")); Parent root = (Parent)fxmlLoader.load(); - Stage newStage = new Stage(); - - // set stage size - if(game.getSettings().getGameSize().equals(GameSize.FULL_SCREEN)) - { - newStage.setScene(new Scene(root)); - newStage.setFullScreen(true); - newStage.setFullScreenExitKeyCombination(KeyCombination.NO_MATCH); - } - else - { - newStage.setScene(new Scene(root, game.getSettings().getGameSize().getWidth(), game.getSettings().getGameSize().getHeight())); - } - + Stage newStage = new Stage(); + newStage.setScene(new Scene(root, game.getSettings().getGameSize().getWidth(), game.getSettings().getGameSize().getHeight())); newStage.setTitle(bundle.getString("app.name") + " - " + game.getLevel().getName()); newStage.initOwner(stage); diff --git a/src/de/bricked/ui/cells/ComboBoxResolutionCell.java b/src/de/bricked/ui/cells/ComboBoxResolutionCell.java index 9ebecf82ae767d7512d0bc7501c4d0b374570707..12b7affdacf2ade7a5a15ef0e0836c5cc893c27e 100644 --- a/src/de/bricked/ui/cells/ComboBoxResolutionCell.java +++ b/src/de/bricked/ui/cells/ComboBoxResolutionCell.java @@ -12,14 +12,7 @@ public class ComboBoxResolutionCell extends ComboBoxListCell<GameSize> if( ! empty) { - if(item == GameSize.FULL_SCREEN) - { - setText("Fullscreen"); - } - else - { - setText(item.getWidth() + " x " + item.getHeight()); - } + setText(item.getWidth() + " x " + item.getHeight()); } else {