From 2ecd7c1ce5fb2591e9cadb1d34d418cacb515c51 Mon Sep 17 00:00:00 2001
From: Edvard <edvardee@stud.ntnu.no>
Date: Mon, 20 May 2024 17:23:38 +0200
Subject: [PATCH] Fix wrong button placement
---
src/main/java/org/example/chaosgame/view/ExplorePage.java | 8 +-------
.../example/chaosgame/view/components/MinMaxDialog.java | 8 +++++---
.../chaosgame/view/components/NumberOfStepsInput.java | 4 ++--
src/main/resources/global.css | 5 ++---
4 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/example/chaosgame/view/ExplorePage.java b/src/main/java/org/example/chaosgame/view/ExplorePage.java
index 97e6522..610dce2 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 de0589b..3286a6b 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 75bb62a..ee59938 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 6c89b8a..7957355 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 {
--
GitLab