From 7a5ba3dda075632ea5c50967d75a0172df498d44 Mon Sep 17 00:00:00 2001
From: Edvard <edvardee@stud.ntnu.no>
Date: Wed, 22 May 2024 12:03:24 +0200
Subject: [PATCH] Change order of buttons in sidebar and set min and max height
 for sidebar components

---
 .../org/idatt2003/view/components/ColorPickerComponent.java | 2 ++
 .../org/idatt2003/view/components/FractalSelectionBox.java  | 5 ++++-
 src/main/java/org/idatt2003/view/components/GameButton.java | 2 ++
 src/main/java/org/idatt2003/view/components/SideBar.java    | 6 +++---
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/idatt2003/view/components/ColorPickerComponent.java b/src/main/java/org/idatt2003/view/components/ColorPickerComponent.java
index 233d294..c8f8789 100644
--- a/src/main/java/org/idatt2003/view/components/ColorPickerComponent.java
+++ b/src/main/java/org/idatt2003/view/components/ColorPickerComponent.java
@@ -18,6 +18,8 @@ public class ColorPickerComponent extends ColorPicker {
     this.getStyleClass().add("color-picker");
     this.setMaxWidth(180);
     this.setMinWidth(180);
+    this.setMinHeight(40);
+    this.setMaxHeight(40);
     this.setOnAction(event -> colorChangeHandler.accept(this.getValue()));
   }
 }
diff --git a/src/main/java/org/idatt2003/view/components/FractalSelectionBox.java b/src/main/java/org/idatt2003/view/components/FractalSelectionBox.java
index df1ea7e..8277470 100644
--- a/src/main/java/org/idatt2003/view/components/FractalSelectionBox.java
+++ b/src/main/java/org/idatt2003/view/components/FractalSelectionBox.java
@@ -17,7 +17,10 @@ public class FractalSelectionBox extends ComboBox<String> {
    * @param chaosGameController the controller for the chaos game
    */
   public FractalSelectionBox(ChaosGameController chaosGameController) {
-    this.setPrefWidth(180);
+    this.setMaxWidth(180);
+    this.setMinWidth(180);
+    this.setMinHeight(40);
+    this.setMaxHeight(40);
     this.setPromptText("Julia ");
     this.getItems().addAll("Sierpinski", "Barnsley", "Julia");
 
diff --git a/src/main/java/org/idatt2003/view/components/GameButton.java b/src/main/java/org/idatt2003/view/components/GameButton.java
index 675e2bd..cc75f52 100644
--- a/src/main/java/org/idatt2003/view/components/GameButton.java
+++ b/src/main/java/org/idatt2003/view/components/GameButton.java
@@ -16,5 +16,7 @@ public class GameButton extends Button {
     super(text);
     this.setMaxWidth(180);
     this.setMinWidth(180);
+    this.setMinHeight(40);
+    this.setMaxHeight(40);
   }
 }
diff --git a/src/main/java/org/idatt2003/view/components/SideBar.java b/src/main/java/org/idatt2003/view/components/SideBar.java
index 5abf544..3bf3c60 100644
--- a/src/main/java/org/idatt2003/view/components/SideBar.java
+++ b/src/main/java/org/idatt2003/view/components/SideBar.java
@@ -47,12 +47,12 @@ public class SideBar extends VBox {
             chaosGameController::updateFractalColor);
 
     this.getChildren().addAll(
-            fractalSelectionBox, colorPicker, coordinatesButton,
-            createOwnFractal, saveFractalButton, openFileButton,
+            fractalSelectionBox, colorPicker, createOwnFractal,
+            coordinatesButton, saveFractalButton, openFileButton,
             numberOfStepsInput, runGame, resetGame);
     this.setAlignment(Pos.CENTER_RIGHT);
 
-    VBox.setMargin(coordinatesButton, new Insets(30, 0, 0, 0));
+    VBox.setMargin(createOwnFractal, new Insets(30, 0, 0, 0));
     VBox.setMargin(numberOfStepsInput, new Insets(30, 0, 0, 0));
 
     this.getStyleClass().add("side-bar");
-- 
GitLab