Fix sizing of tables, improve display of level details, improve logo

4 files changed, 19 insertions, 23 deletions

diff --git a/src/main/java/net/sowgro/npehero/editor/DiffEditor.java b/src/main/java/net/sowgro/npehero/editor/DiffEditor.java
index 7671bc6..8591019 100755
--- a/src/main/java/net/sowgro/npehero/editor/DiffEditor.java
+++ b/src/main/java/net/sowgro/npehero/editor/DiffEditor.java
@@ -10,7 +10,6 @@ import net.sowgro.npehero.Driver;
 import net.sowgro.npehero.gameplay.Block;
 import net.sowgro.npehero.gui.LevelSurround;
 import javafx.scene.layout.VBox;
-import javafx.scene.text.Text;
 import net.sowgro.npehero.levelapi.Difficulty;
 import net.sowgro.npehero.levelapi.Note;
 import net.sowgro.npehero.main.*;
@@ -30,11 +29,11 @@ public class DiffEditor extends Page
         this.diff = diff;
         this.prev = prev;
 
-        Text folderNameLabel = new Text("Folder name");
+        Label folderNameLabel = new Label("Folder name");
         TextField folderName = new TextField(diff.thisDir.getName());
         folderName.setDisable(true);
 
-        Text titleLabel = new Text("Title");
+        Label titleLabel = new Label("Title");
         TextField title = new TextField(diff.title);
 
         Button editNotes = new Button("Edit notes");
@@ -110,6 +109,8 @@ public class DiffEditor extends Page
         scroll.getStyleClass().remove("scroll-pane");
         scroll.getStyleClass().add("box");
 //        scroll.setPrefHeight(400);
+        System.out.println("dbg"+scroll.heightProperty());
+        // TODO scroll.heightProperty is 0 here until the window is resized, idk what to do
         scroll.prefWidthProperty().bind(scroll.heightProperty().multiply(0.66));
 
         Pane[] lanes = new Pane[5];
@@ -121,7 +122,7 @@ public class DiffEditor extends Page
         scrollContent.setSpacing(5);
         scrollContent.setAlignment(Pos.CENTER);
 
-        diff.notes.list.forEach(n -> lanes[n.lane].getChildren().add(drawNote(n)));
+        diff.notes.list.forEach(n -> lanes[n.lane].getChildren().add(drawBlock(n)));
 
         VBox notePreview = new VBox();
 
@@ -170,7 +171,7 @@ public class DiffEditor extends Page
     }
 
     // Duplicates of NotesEditor2 methods, should be made generic and combined
-    private Block drawNote(Note n) {
+    private Block drawBlock(Note n) {
         Color color = diff.level.colors[n.lane];
         Block b = new Block(color,20, 20, 5, false, n);
         b.heightProperty().bind(scroll.widthProperty().divide(8));
diff --git a/src/main/java/net/sowgro/npehero/editor/DiffList.java b/src/main/java/net/sowgro/npehero/editor/DiffList.java
index f3769ab..7369457 100755
--- a/src/main/java/net/sowgro/npehero/editor/DiffList.java
+++ b/src/main/java/net/sowgro/npehero/editor/DiffList.java
@@ -37,18 +37,14 @@ public class DiffList extends Page
         TableColumn<Difficulty,String> titleCol = new TableColumn<>("Name");
         TableColumn<Difficulty,String> validCol = new TableColumn<>("Valid?");
 
+        titleCol.prefWidthProperty().bind(diffs.widthProperty().multiply(0.4));
+        validCol.prefWidthProperty().bind(diffs.widthProperty().multiply(0.4));
+
         diffs.getColumns().add(titleCol);
         diffs.getColumns().add(validCol);
 
         titleCol.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().title));
-        validCol.setCellValueFactory(data -> {
-            if (data.getValue().isValid()) {
-                return new ReadOnlyStringWrapper("Yes");
-            }
-            else {
-                return new ReadOnlyStringWrapper("No");
-            }
-        });
+        validCol.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().isValid() ? "Yes" : "No"));
 
         diffs.setItems(level.difficulties.list);
 
diff --git a/src/main/java/net/sowgro/npehero/editor/LevelEditor.java b/src/main/java/net/sowgro/npehero/editor/LevelEditor.java
index ae56d44..e17d209 100755
--- a/src/main/java/net/sowgro/npehero/editor/LevelEditor.java
+++ b/src/main/java/net/sowgro/npehero/editor/LevelEditor.java
@@ -90,19 +90,14 @@ public class LevelEditor extends Page
         TableColumn<Difficulty,String> diffCol = new TableColumn<>("Difficulty");
         TableColumn<Difficulty,String> validCol = new TableColumn<>("Valid?");
 
+        diffCol.prefWidthProperty().bind(diffList.widthProperty().multiply(0.45));
+        validCol.prefWidthProperty().bind(diffList.widthProperty().multiply(0.45));
+
         diffList.getColumns().add(diffCol);
         diffList.getColumns().add(validCol);
 
         diffCol.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().title));
-        validCol.setCellValueFactory(data -> {
-            if (data.getValue().isValid()) {
-                return new ReadOnlyStringWrapper("Yes");
-            }
-            else {
-                return new ReadOnlyStringWrapper("No");
-            }
-        });
-
+        validCol.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().isValid() ? "Yes" : "No"));
         diffList.setItems(level.difficulties.list);
 
         diffList.setRowFactory( _ -> {
diff --git a/src/main/java/net/sowgro/npehero/editor/LevelList.java b/src/main/java/net/sowgro/npehero/editor/LevelList.java
index 596f433..41c824e 100755
--- a/src/main/java/net/sowgro/npehero/editor/LevelList.java
+++ b/src/main/java/net/sowgro/npehero/editor/LevelList.java
@@ -34,6 +34,10 @@ public class LevelList extends Page
         TableColumn<Level,String> artistCol = new TableColumn<>("Artist");
         TableColumn<Level,String> validCol = new TableColumn<>("Valid?");
 
+        titleCol.prefWidthProperty().bind(levels.widthProperty().multiply(0.4));
+        artistCol.prefWidthProperty().bind(levels.widthProperty().multiply(0.4));
+        validCol.prefWidthProperty().bind(levels.widthProperty().multiply(0.15));
+
         levels.getColumns().add(titleCol);
         levels.getColumns().add(artistCol);
         levels.getColumns().add(validCol);
@@ -128,7 +132,7 @@ public class LevelList extends Page
 
         Button exit = new Button();
         exit.setText("Back");
-        exit.setOnAction(e -> {
+        exit.setOnAction(_ -> {
             Sound.playSfx(Sound.BACKWARD);
             Driver.setMenu(new MainMenu());
         });