diff options
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/Driver.java | 29 | ||||
-rw-r--r-- | src/gui/GameOver.java | 2 | ||||
-rw-r--r-- | src/gui/Settings.java | 1 | ||||
-rw-r--r-- | src/gui/style.css | 19 |
4 files changed, 14 insertions, 37 deletions
diff --git a/src/gui/Driver.java b/src/gui/Driver.java index b588b22..9e09860 100644 --- a/src/gui/Driver.java +++ b/src/gui/Driver.java @@ -14,28 +14,11 @@ import javafx.scene.layout.BackgroundPosition; import javafx.scene.layout.BackgroundRepeat; import javafx.scene.layout.BackgroundSize; import javafx.scene.layout.Pane; -import javafx.scene.media.Media; -import javafx.scene.media.MediaPlayer; -import javafx.scene.media.MediaView; import javafx.stage.Stage; -import javafx.util.Duration; import main.LevelController; import main.SettingsController; import main.SoundController; - -import java.nio.file.Paths; - -import javax.sound.sampled.AudioFileFormat; - -// import javafx.scene.image.ImageView; -// import javafx.beans.property.Property; -// import javafx.util.Duration; -// import javafx.animation.KeyFrame; -// import javafx.animation.KeyValue; -// import javafx.animation.Timeline; - import devmenu.DebugMenu; -import gameplay.SongPlayer; public class Driver extends Application @@ -63,8 +46,6 @@ public class Driver extends Application @Override public void start(Stage newPrimaryStage) { - - primaryStage = newPrimaryStage; Scene primaryScene = new Scene(primaryPane, 800,600); @@ -116,16 +97,6 @@ public class Driver extends Application */ public static void setBackground(String url) //replaces background with a new one { - // Image image1; - // Image image2; - // ImageView imageView; - // KeyFrame keyFrame1On = new KeyFrame(Duration.seconds(0), new KeyValue(imageView.imageProperty(), image1)); - // KeyFrame startFadeOut = new KeyFrame(Duration.seconds(0.2), new KeyValue(imageView.opacityProperty(), 1.0)); - // KeyFrame endFadeOut = new KeyFrame(Duration.seconds(0.5), new KeyValue(imageView.opacityProperty(), 0.0)); - // KeyFrame keyFrame2On = new KeyFrame(Duration.seconds(0.5), new KeyValue(imageView.imageProperty(), image2)); - // KeyFrame endFadeIn = new KeyFrame(Duration.seconds(0.8), new KeyValue(imageView.opacityProperty(), 1.0)); - // Timeline timelineOn = new Timeline(keyFrame1On, startFadeOut, endFadeOut, keyFrame2On, endFadeIn); - primaryPane.setBackground(new Background( new BackgroundImage( new Image(url), diff --git a/src/gui/GameOver.java b/src/gui/GameOver.java index f5b46ec..8571d20 100644 --- a/src/gui/GameOver.java +++ b/src/gui/GameOver.java @@ -25,7 +25,7 @@ public class GameOver extends Pane { Text topText = new Text(); topText.setText("Level Complete"); - topText.getStyleClass().add("t1"); + topText.getStyleClass().add("t11"); Text levelName = new Text(); levelName.setText(level.getTitle()); diff --git a/src/gui/Settings.java b/src/gui/Settings.java index 2144e16..663353a 100644 --- a/src/gui/Settings.java +++ b/src/gui/Settings.java @@ -101,6 +101,7 @@ public class Settings extends Pane Button exit = new Button(); exit.setText("Back"); exit.setOnAction(e -> { + Driver.settingsController.write(); Driver.soundController.playSfx("backward"); Driver.setMenu(new MainMenu()); }); diff --git a/src/gui/style.css b/src/gui/style.css index 70dd775..09e164e 100644 --- a/src/gui/style.css +++ b/src/gui/style.css @@ -73,9 +73,9 @@ TableView { -fx-background-color: transparent; -fx-background-radius: 3; -fx-text-background-color: rgb(255, 255, 255); - -fx-border-width: 3; - -fx-border-radius: 5; - -fx-border-color: transparent; + /* -fx-border-width: 3; */ + /* -fx-border-radius: 5; */ + /* -fx-border-color: transparent; */ } .table-row-cell:hover { @@ -89,7 +89,7 @@ TableView:focused { TableView:focused .list-cell:focused { -fx-background-color: rgb(50, 50, 50, 0.5); - -fx-border-color: rgb(255, 255, 255); + /* -fx-border-color: rgb(255, 255, 255); */ } .table-row-cell:selected { @@ -99,18 +99,18 @@ TableView:focused .list-cell:focused { .table-row-cell:pressed { -fx-background-color: rgb(231, 231, 231); - -fx-border-color: transparent; + /* -fx-border-color: transparent; */ } .table-row-cell:empty { -fx-background-color: transparent; - -fx-border-color: transparent; + /* -fx-border-color: transparent; */ -fx-text-background-color: white; } .unselectable .table-row-cell{ -fx-background-color: transparent; - -fx-border-color: transparent; + /* -fx-border-color: transparent; */ -fx-text-background-color: white; } @@ -197,6 +197,11 @@ Slider:focused .thumb{ -fx-fill: white; } +.t11 { + -fx-font-size: 50; + -fx-fill: black; +} + .t2 { -fx-font-size: 30; -fx-fill: white; |