Minor fixes

Ledmington · Sep 12, 2024 · c7b8b8c · c7b8b8c
1 parent 502b083
commit c7b8b8c
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 6 deletions.
diff --git a/emu-gui/src/main/java/com/ledmington/emu/AppConstants.java b/emu-gui/src/main/java/com/ledmington/emu/AppConstants.java
@@ -66,4 +66,14 @@ public static void setDefaultMonospaceFont(final String monospaceFontFamily) {
         }
         MONOSPACE_FONT_FAMILY = monospaceFontFamily;
     }
+
+    /** Shorthand default font size. */
+    public static int DEFAULT_FONT_SIZE = 12;
+
+    public static void setDefaultFontSize(final int newFontSize) {
+        if (newFontSize <= 1) {
+            throw new IllegalArgumentException(String.format("Invalid font size: %,d", newFontSize));
+        }
+        DEFAULT_FONT_SIZE = newFontSize;
+    }
 }
diff --git a/emu-gui/src/main/java/com/ledmington/emu/ELFViewer.java b/emu-gui/src/main/java/com/ledmington/emu/ELFViewer.java
@@ -53,9 +53,12 @@ public ELFViewer(final double width, final double height) {
             }
         });
 
+        final Button settings = new Button();
+        settings.setText("Settings");
+        settings.setOnAction(e -> new SettingsWindow());
+
         textArea.setEditable(false);
-        textArea.setFont(new Font(AppConstants.MONOSPACE_FONT_FAMILY, 12));
-        vbox.getChildren().addAll(load, textArea);
+        vbox.getChildren().addAll(load, settings, textArea);
         final Scene scene = new Scene(vbox);
 
         this.setScene(scene);
@@ -89,6 +92,7 @@ private void loadFile(final File elfFile) {
                 sb.append('\n');
             }
         }
+        textArea.setFont(new Font(AppConstants.MONOSPACE_FONT_FAMILY, AppConstants.DEFAULT_FONT_SIZE));
         this.textArea.setText(sb.toString());
     }
 }
diff --git a/emu-gui/src/main/java/com/ledmington/emu/SettingsWindow.java b/emu-gui/src/main/java/com/ledmington/emu/SettingsWindow.java
@@ -22,6 +22,7 @@
 import javafx.scene.control.Button;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.Label;
+import javafx.scene.control.Spinner;
 import javafx.scene.layout.Background;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.FlowPane;
@@ -34,6 +35,7 @@
 public final class SettingsWindow extends Stage {
 
     private final ComboBox<Label> fonts;
+    private final Spinner<Integer> fontSize;
 
     public SettingsWindow() {
         final BorderPane bPane = new BorderPane();
@@ -43,14 +45,23 @@ public SettingsWindow() {
         {
             mainPane.getChildren().add(new Label("Font"));
             fonts = new ComboBox<>();
-            for (final String fontName : Font.getFontNames()) {
-                final Label lbl = new Label(fontName);
-                lbl.setFont(Font.font(fontName, FontWeight.NORMAL, FontPosture.REGULAR, 11));
+            for (final String fontFamily : Font.getFamilies()) {
+                final Label lbl = new Label(fontFamily);
+                lbl.setFont(
+                        Font.font(fontFamily, FontWeight.NORMAL, FontPosture.REGULAR, AppConstants.DEFAULT_FONT_SIZE));
+                lbl.setTextFill(Color.BLACK);
                 fonts.getItems().add(lbl);
+                if (fonts.getValue() == null) {
+                    fonts.setValue(lbl);
+                }
             }
-            fonts.setOnMouseClicked(e -> System.out.printf("Clicked '%s'\n", e));
             mainPane.getChildren().add(fonts);
         }
+        {
+            mainPane.getChildren().add(new Label("Font Size"));
+            fontSize = new Spinner<>(1, 20, AppConstants.DEFAULT_FONT_SIZE);
+            mainPane.getChildren().add(fontSize);
+        }
         bPane.setCenter(mainPane);
 
         final FlowPane bottomPane = new FlowPane();
@@ -59,6 +70,7 @@ public SettingsWindow() {
             ok.setBackground(Background.fill(Color.LIGHTBLUE));
             ok.setOnMouseClicked(e -> {
                 AppConstants.setDefaultMonospaceFont(fonts.getValue().getText());
+                AppConstants.setDefaultFontSize(fontSize.getValue());
                 this.close();
             });
             bottomPane.getChildren().add(ok);