diff --git a/src/main/java/org/example/chaosgame/view/ExplorePage.java b/src/main/java/org/example/chaosgame/view/ExplorePage.java index 97e6522b52bdae8e577317b26893bcbd8a709747..610dce2870d3932bea90c088c3a446789c10a1ca 100644 --- a/src/main/java/org/example/chaosgame/view/ExplorePage.java +++ b/src/main/java/org/example/chaosgame/view/ExplorePage.java @@ -36,13 +36,7 @@ public class ExplorePage extends GamePage { this.setBottom(bottomBar); this.setTop(topBar); - gc.getCanvas().setOnScroll(event -> { - try { - exploreGameController.onScroll(event); - } catch (Exception e) { - exploreGameController.resetImage(); - } - }); + gc.getCanvas().setOnScroll(exploreGameController::onScroll); this.setOnMousePressed(exploreGameController::mousePressed); this.setOnMouseDragged(exploreGameController::mouseDragged); this.setOnMouseReleased(exploreGameController::mouseReleased); diff --git a/src/main/java/org/example/chaosgame/view/components/MinMaxDialog.java b/src/main/java/org/example/chaosgame/view/components/MinMaxDialog.java index de0589baaeeaf30a31be6beca32ff59313c70893..3286a6b549c2d5c0a9515c11ae87e07c785e67d1 100644 --- a/src/main/java/org/example/chaosgame/view/components/MinMaxDialog.java +++ b/src/main/java/org/example/chaosgame/view/components/MinMaxDialog.java @@ -1,6 +1,8 @@ package org.example.chaosgame.view.components; import java.util.List; + +import javafx.scene.control.ButtonBar; import javafx.scene.control.ButtonType; import javafx.scene.control.Dialog; import javafx.scene.control.TextField; @@ -24,8 +26,8 @@ public class MinMaxDialog extends Dialog<List<String>> { setTitle("Set Min/Max Coordinates"); setHeaderText("Please enter the min and max coordinates:"); - ButtonType okButtonType = new ButtonType("OK"); - getDialogPane().getButtonTypes().addAll(ButtonType.CANCEL, okButtonType); + ButtonType saveButtonType = new ButtonType("Save", ButtonBar.ButtonData.OK_DONE); + this.getDialogPane().getButtonTypes().addAll(saveButtonType, ButtonType.CANCEL); GridPane grid = new GridPane(); grid.setHgap(10); @@ -49,7 +51,7 @@ public class MinMaxDialog extends Dialog<List<String>> { getDialogPane().setContent(grid); setResultConverter(dialogButton -> { - if (dialogButton == okButtonType) { + if (dialogButton == saveButtonType) { String minX = minXField.getText(); String minY = minYField.getText(); String maxX = maxXField.getText(); diff --git a/src/main/java/org/example/chaosgame/view/components/NumberOfStepsInput.java b/src/main/java/org/example/chaosgame/view/components/NumberOfStepsInput.java index 75bb62a31935405af03581c2e174827dc0bdb991..ee59938e76cb7a23b6a565220a5ee04d958c0103 100644 --- a/src/main/java/org/example/chaosgame/view/components/NumberOfStepsInput.java +++ b/src/main/java/org/example/chaosgame/view/components/NumberOfStepsInput.java @@ -15,7 +15,7 @@ public class NumberOfStepsInput extends TextField { this.setPromptText("Number of steps"); this.setMaxWidth(180); this.setMinWidth(180); - this.setMinHeight(30); - this.setMaxHeight(30); + this.setMinHeight(40); + this.setMaxHeight(40); } } diff --git a/src/main/resources/global.css b/src/main/resources/global.css index 6c89b8a6cad684d81753177f9852d880fe1e0dfa..7957355911a0fff1faa5f148816c061df412d7b4 100644 --- a/src/main/resources/global.css +++ b/src/main/resources/global.css @@ -27,8 +27,8 @@ .text-field { -fx-font: 20 arial; - -fx-background-color: #252525; - -fx-text-fill: white; + -fx-background-color: white; + -fx-text-fill: black; -fx-border-color: #3b3b3b; -fx-background-radius: 20; -fx-border-radius: 20; @@ -60,7 +60,6 @@ .combo-box .indexed-cell:selected { -fx-text-fill: white; - -fx-background-radius: 20; } .choose-game-button {