From a83e05960f1dfceed3fbeb9ff21e7720187429b6 Mon Sep 17 00:00:00 2001
From: Paul Falstad <paul@falstad.com>
Date: Sun, 1 Mar 2026 11:15:58 -0800
Subject: [PATCH] fix toolbar subcircuit, back button formatting

---
 .../lushprojects/circuitjs1/client/Toolbar.java    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/com/lushprojects/circuitjs1/client/Toolbar.java b/src/com/lushprojects/circuitjs1/client/Toolbar.java
index c2e0b1bc..c4bb1207 100644
--- a/src/com/lushprojects/circuitjs1/client/Toolbar.java
+++ b/src/com/lushprojects/circuitjs1/client/Toolbar.java
@@ -16,7 +16,7 @@ import com.lushprojects.circuitjs1.client.util.Locale;
 
 import java.util.HashMap;
 
-public class Toolbar extends HorizontalPanel {
+public class Toolbar extends FlowPanel {
 
     private Label modeLabel;
     private Label subcircuitLabel;
@@ -35,8 +35,7 @@ public class Toolbar extends HorizontalPanel {
         style.setBorderStyle(Style.BorderStyle.SOLID);
         style.setBorderColor("#ccc");
         style.setDisplay(Style.Display.FLEX);
-	setVerticalAlignment(ALIGN_MIDDLE);
-	setWidth("100%");
+	style.setProperty("alignItems", "center");
 
 	add(createIconButton("ccw", "Undo", new MyCommand("edit", "undo")));
 	add(createIconButton("cw",  "Redo", new MyCommand("edit", "redo")));
@@ -74,15 +73,20 @@ public class Toolbar extends HorizontalPanel {
 	add(createButtonSet(fetInfo));
 
 	add(createIconButton(inverterIcon, "InverterElm"));
-	String gateInfo[] = { andIcon, "AndGateElm", nandIcon, "NandGateElm", 
+	String gateInfo[] = { andIcon, "AndGateElm", nandIcon, "NandGateElm",
 			      orIcon, "OrGateElm", norIcon, "NorGateElm", xorIcon, "XorGateElm" };
 	add(createButtonSet(gateInfo));
 
-        // Create and add the mode label on the right
+        // Create and add the mode label
         modeLabel = new Label("");
         styleModeLabel(modeLabel);
         add(modeLabel);
 
+	// Spacer to push subcircuit info to the right
+	Label spacer = new Label("");
+	spacer.getElement().getStyle().setProperty("flexGrow", "1");
+	add(spacer);
+
 	// Subcircuit path label (hidden by default)
 	subcircuitLabel = new Label("");
 	styleModeLabel(subcircuitLabel);