GUI edits

Convex-Dev · May 15, 2024 · 7f654b3 · 7f654b3
1 parent 5db9bed
commit 7f654b3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/convex-core/src/main/java/convex/core/data/Blobs.java b/convex-core/src/main/java/convex/core/data/Blobs.java
@@ -34,7 +34,7 @@ public static <T extends ABlob> T createRandom(Random r, long length) {
 	}
 
 	/**
-	 * Converts any blob to a the correct canonical Blob format
+	 * Converts any blob to a correct canonical Blob format
 	 * @param a Any Blob
 	 * @return Canonical version s a Blob or BlobTree
 	 */

diff --git a/convex-gui/src/main/java/convex/gui/peer/PeerGUI.java b/convex-gui/src/main/java/convex/gui/peer/PeerGUI.java
@@ -465,7 +465,11 @@ public static void runLaunchDialog(JComponent parent) {
 
 		JButton randomise=new JButton("Randomise",SymbolIcon.get(0xe863,Toolkit.SMALL_ICON_SIZE)); 
 		randomise.addActionListener(e->{
-			keyField.setSelectedItem(HotWalletEntry.create(AKeyPair.generate()));
+			AKeyPair newKP=AKeyPair.generate();
+			// System.err.println("Generated key "+newKP.getAccountKey());
+			// Note we go to the model directly, JComboBox doeesn't like
+			// setting a selected item to something not in the list when not editable
+			keyField.getModel().setSelectedItem(HotWalletEntry.create(newKP));
 		});
 		pan.add(randomise);
 

diff --git a/convex-gui/src/main/java/convex/gui/utils/Toolkit.java b/convex-gui/src/main/java/convex/gui/utils/Toolkit.java
@@ -61,12 +61,11 @@ public class Toolkit {
 	public static final int SMALL_ICON_SIZE = (int) (16*SCALE);
 	public static final int MAIN_ICON_SIZE = (int) (64*SCALE);
 
-
-	public static final float DEFAULT_FONT_SIZE=14;
+	public static final float DEFAULT_FONT_SIZE=16;
 
 	public static Font DEFAULT_FONT = new Font(Font.SANS_SERIF,Font.PLAIN,(int)DEFAULT_FONT_SIZE);
 	public static Font MONO_FONT = new Font(Font.MONOSPACED, Font.BOLD, (int)(DEFAULT_FONT_SIZE));
-	public static Font BUTTON_FONT = new Font(Font.SANS_SERIF, Font.PLAIN, (int)(DEFAULT_FONT_SIZE*1.6));
+	public static Font BUTTON_FONT = new Font(Font.SANS_SERIF, Font.PLAIN, (int)(DEFAULT_FONT_SIZE*1.2));
 
 	public static final float SYMBOL_FONT_SIZE= DEFAULT_FONT_SIZE;
 
@@ -107,6 +106,7 @@ public class Toolkit {
 	}
 
 	protected static LookAndFeel installFlatLaf() {
+		System.setProperty("flatlaf.uiScale", "1.5");
 		// System.setProperty("flatlaf.uiScale", Double.toString(SCALE));
 		FlatDarculaLaf laf=new FlatDarculaLaf();
 		return laf;