Add action toolbar to the model viewer

odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/menu/graph/ExportObjectAction.java

@@ -36,7 +36,7 @@
 
 import static java.nio.file.StandardOpenOption.*;
 
-@ActionRegistration(id = ExportObjectAction.ID, text = "&Export As\u2026", icon = "fugue:blue-document-export", keystroke = "ctrl E")
+@ActionRegistration(id = ExportObjectAction.ID, text = "&Export As\u2026", description = "Export selected resources in a supported format", icon = "fugue:blue-document-export", keystroke = "ctrl E")
 @ActionContribution(parent = BookmarkMenu.ID, group = MenuIds.GROUP_EXPORT)
 @ActionContribution(parent = EditorMenu.ID, group = MenuIds.GROUP_EXPORT)
 @ActionContribution(parent = GraphMenu.ID, group = MenuIds.GROUP_EXPORT)

odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/menu/main/file/OpenGraphAction.java

@@ -9,7 +9,7 @@
 import sh.adelessfox.odradek.ui.actions.ActionContribution;
 import sh.adelessfox.odradek.ui.actions.ActionRegistration;
 
-@ActionRegistration(text = "Open Streaming Graph", description = "Opens the streaming graph resource")
+@ActionRegistration(text = "Open Streaming Graph", description = "Open the streaming graph resource")
 @ActionContribution(parent = MainMenu.File.ID)
 public class OpenGraphAction extends Action {
     @Override

odradek-ui/src/main/java/module-info.java

@@ -13,6 +13,7 @@
 
     exports sh.adelessfox.odradek.ui.actions;
     exports sh.adelessfox.odradek.ui.components.laf;
+    exports sh.adelessfox.odradek.ui.components.properties;
     exports sh.adelessfox.odradek.ui.components.tool;
     exports sh.adelessfox.odradek.ui.components.tree;
     exports sh.adelessfox.odradek.ui.components;

odradek-ui/src/main/java/sh/adelessfox/odradek/ui/actions/Actions.java

@@ -2,6 +2,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import sh.adelessfox.odradek.ui.components.SplitButton;
 import sh.adelessfox.odradek.ui.data.DataContext;
 import sh.adelessfox.odradek.ui.util.Icons;
 import sh.adelessfox.odradek.util.system.OperatingSystem;
@@ -13,6 +14,7 @@
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.beans.PropertyChangeListener;
 import java.lang.reflect.Field;
 import java.util.*;
 import java.util.function.Function;
@@ -42,7 +44,7 @@ public static void installContextMenu(JComponent component, String id, DataConte
     }
 
     public static JToolBar createToolBar(String id, DataContext context) {
-        var toolBar = new JToolBar();
+        var toolBar = new ActionToolBar();
         contributeGroups(toolBar, new ToolBarActionContributor(), id, new ActionContext(context, null, null));
         return toolBar;
     }
@@ -389,12 +391,13 @@ public PopupMenuAction(
             super(descriptor, context);
         }
 
-        @SuppressWarnings("unchecked")
         @Override
         public void actionPerformed(ActionEvent e) {
-            var popupMenu = createPopupMenu(component, descriptor.id(), context, includeSourceAction);
-            var selectionProvider = getSelectionProvider(component);
-            showPopupMenu(component, popupMenu, e, (SelectionProvider<JComponent, ?>) selectionProvider);
+            // Handled by ActionToolBar#createActionComponent
+        }
+
+        JPopupMenu createPopupMenu() {
+            return Actions.createPopupMenu(component, descriptor.id(), context, includeSourceAction);
         }
     }
 
@@ -623,4 +626,30 @@ private interface ActionContributor<C, T> {
 
         T createItem(C component, AbstractMenuAction action);
     }
+
+    private static class ActionToolBar extends JToolBar {
+        @Override
+        protected JButton createActionComponent(javax.swing.Action a) {
+            if (a instanceof PopupMenuAction action) {
+                var button = new SplitButton() {
+                    @Override
+                    protected PropertyChangeListener createActionPropertyChangeListener(javax.swing.Action a) {
+                        PropertyChangeListener pcl = createActionChangeListener(this);
+                        if (pcl == null) {
+                            pcl = super.createActionPropertyChangeListener(a);
+                        }
+                        return pcl;
+                    }
+                };
+                button.setPopupMenu(action.createPopupMenu());
+                if (a.getValue(javax.swing.Action.SMALL_ICON) != null |
+                    a.getValue(javax.swing.Action.LARGE_ICON_KEY) != null
+                ) {
+                    button.setHideActionText(true);
+                }
+                return button;
+            }
+            return super.createActionComponent(a);
+        }
+    }
 }

odradek-ui/src/main/java/sh/adelessfox/odradek/ui/components/LabeledSeparator.java

@@ -0,0 +1,47 @@
+package sh.adelessfox.odradek.ui.components;
+
+import javax.swing.*;
+import java.util.Objects;
+
+public class LabeledSeparator extends JSeparator {
+    private String label;
+
+    public LabeledSeparator(String label) {
+        this(label, HORIZONTAL);
+    }
+
+    public LabeledSeparator(String label, int orientation) {
+        super(orientation);
+        setLabel(label);
+    }
+
+    @Override
+    public String getUIClassID() {
+        return "LabeledSeparatorUI";
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        final String oldLabel = this.label;
+
+        if (!Objects.equals(oldLabel, label)) {
+            this.label = label;
+
+            firePropertyChange("label", oldLabel, label);
+            revalidate();
+            repaint();
+        }
+    }
+
+    @Override
+    public void setOrientation(int orientation) {
+        if (orientation != HORIZONTAL) {
+            throw new IllegalArgumentException("orientation must be HORIZONTAL");
+        }
+
+        super.setOrientation(orientation);
+    }
+}

odradek-ui/src/main/java/sh/adelessfox/odradek/ui/components/SplitButton.java

@@ -0,0 +1,58 @@
+package sh.adelessfox.odradek.ui.components;
+
+import javax.swing.*;
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
+
+public class SplitButton extends JButton {
+    private final PopupMenuListener popupMenuListener = createPopupMenuListener();
+    private JPopupMenu popupMenu;
+
+    public SplitButton() {
+        setHorizontalAlignment(SwingConstants.LEFT);
+        setPopupMenu(new JPopupMenu());
+        addActionListener(_ -> showPopupMenu());
+    }
+
+    @Override
+    public String getUIClassID() {
+        return "SplitButtonUI";
+    }
+
+    public JPopupMenu getPopupMenu() {
+        return popupMenu;
+    }
+
+    public void setPopupMenu(JPopupMenu popupMenu) {
+        if (this.popupMenu != popupMenu) {
+            if (this.popupMenu != null) {
+                this.popupMenu.removePopupMenuListener(popupMenuListener);
+            }
+            this.popupMenu = popupMenu;
+            popupMenu.addPopupMenuListener(popupMenuListener);
+        }
+    }
+
+    private void showPopupMenu() {
+        popupMenu.show(this, 0, getHeight());
+    }
+
+    private PopupMenuListener createPopupMenuListener() {
+        return new PopupMenuListener() {
+            @Override
+            public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+                getModel().setPressed(true);
+            }
+
+            @Override
+            public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+                getModel().setPressed(false);
+            }
+
+            @Override
+            public void popupMenuCanceled(PopupMenuEvent e) {
+                getModel().setPressed(false);
+            }
+        };
+    }
+}

odradek-ui/src/main/java/sh/adelessfox/odradek/ui/components/laf/FlatLabeledSeparatorUI.java

@@ -0,0 +1,92 @@
+package sh.adelessfox.odradek.ui.components.laf;
+
+import com.formdev.flatlaf.ui.FlatSeparatorUI;
+import com.formdev.flatlaf.ui.FlatUIUtils;
+import com.formdev.flatlaf.util.UIScale;
+import sh.adelessfox.odradek.ui.components.LabeledSeparator;
+import sh.adelessfox.odradek.ui.util.GraphicsUtils;
+
+import javax.swing.*;
+import javax.swing.plaf.ComponentUI;
+import java.awt.*;
+import java.awt.geom.Rectangle2D;
+
+public final class FlatLabeledSeparatorUI extends FlatSeparatorUI {
+    private Color labelForeground;
+    private boolean defaultsInitialized = false;
+
+    private FlatLabeledSeparatorUI(boolean shared) {
+        super(shared);
+    }
+
+    public static ComponentUI createUI(JComponent c) {
+        return FlatUIUtils.canUseSharedUI(c)
+            ? FlatUIUtils.createSharedUI(FlatLabeledSeparatorUI.class, () -> new FlatLabeledSeparatorUI(true))
+            : new FlatLabeledSeparatorUI(false);
+    }
+
+    @Override
+    protected void installDefaults(JSeparator s) {
+        super.installDefaults(s);
+
+        if (!defaultsInitialized) {
+            labelForeground = UIManager.getColor("LabeledSeparator.labelForeground");
+            defaultsInitialized = true;
+        }
+    }
+
+    @Override
+    protected void uninstallDefaults(JSeparator s) {
+        super.uninstallDefaults(s);
+        defaultsInitialized = false;
+    }
+
+    @Override
+    public void paint(Graphics g, JComponent c) {
+        var g2 = (Graphics2D) g.create();
+        try {
+            String label = ((LabeledSeparator) c).getLabel();
+            float width = UIScale.scale((float) stripeWidth);
+            float indent = UIScale.scale((float) stripeIndent);
+            float height = getHeight(c);
+            float shift;
+
+            if (label != null && !label.isEmpty()) {
+                var metrics = c.getFontMetrics(g.getFont());
+
+                GraphicsUtils.setTextRenderingHints(g2);
+                g2.setColor(labelForeground);
+                g2.drawString(label, indent, metrics.getAscent());
+
+                shift = metrics.stringWidth(label) + UIScale.scale(5f);
+            } else {
+                shift = 0;
+            }
+
+            FlatUIUtils.setRenderingHints(g2);
+            g2.setColor(c.getForeground());
+            g2.fill(new Rectangle2D.Float(shift, indent + height / 2, c.getWidth() - shift, width));
+        } finally {
+            g2.dispose();
+        }
+    }
+
+    @Override
+    public Dimension getPreferredSize(JComponent c) {
+        return new Dimension(0, getHeight(c));
+    }
+
+    @Override
+    public Dimension getMinimumSize(JComponent c) {
+        return getPreferredSize(c);
+    }
+
+    private int getHeight(JComponent c) {
+        var label = ((LabeledSeparator) c).getLabel();
+        if (label != null && !label.isEmpty()) {
+            return c.getFontMetrics(c.getFont()).getHeight();
+        } else {
+            return UIScale.scale(this.height);
+        }
+    }
+}

odradek-ui/src/main/java/sh/adelessfox/odradek/ui/components/laf/FlatSplitButtonUI.java

@@ -0,0 +1,69 @@
+package sh.adelessfox.odradek.ui.components.laf;
+
+import com.formdev.flatlaf.ui.FlatButtonUI;
+import com.formdev.flatlaf.ui.FlatUIUtils;
+import com.formdev.flatlaf.util.UIScale;
+
+import javax.swing.*;
+import javax.swing.plaf.ComponentUI;
+import java.awt.*;
+
+public final class FlatSplitButtonUI extends FlatButtonUI {
+    private Color arrowColor;
+    private int arrowWidth;
+    private int arrowGap;
+
+    private boolean defaultsInitialized = false;
+
+    private FlatSplitButtonUI(boolean shared) {
+        super(shared);
+    }
+
+    public static ComponentUI createUI(JComponent c) {
+        return FlatUIUtils.canUseSharedUI(c)
+            ? FlatUIUtils.createSharedUI(FlatSplitButtonUI.class, () -> new FlatSplitButtonUI(true))
+            : new FlatSplitButtonUI(false);
+    }
+
+    @Override
+    protected void installDefaults(AbstractButton b) {
+        super.installDefaults(b);
+
+        if (!defaultsInitialized) {
+            arrowColor = UIManager.getColor("SplitButton.arrowColor");
+            arrowWidth = UIManager.getInt("SplitButton.arrowWidth");
+            arrowGap = UIManager.getInt("SplitButton.arrowGap");
+            defaultsInitialized = true;
+        }
+    }
+
+    @Override
+    protected void uninstallDefaults(AbstractButton b) {
+        super.uninstallDefaults(b);
+        defaultsInitialized = false;
+    }
+
+    @Override
+    public void paint(Graphics g, JComponent c) {
+        super.paint(g, c);
+        paintArrow(g, c);
+    }
+
+    private void paintArrow(Graphics g, JComponent c) {
+        int x = c.getWidth() - c.getInsets().right - UIScale.scale(Math.ceilDiv(arrowWidth, 2));
+        int y = c.getHeight() / 2;
+
+        var g2 = (Graphics2D) g.create();
+        FlatUIUtils.setRenderingHints(g2);
+        g2.setColor(arrowColor);
+        FlatUIUtils.paintArrow(g2, x, y, 0, 0, SwingConstants.SOUTH, true, arrowWidth, 1, 0, 0);
+        g2.dispose();
+    }
+
+    @Override
+    public Dimension getPreferredSize(JComponent c) {
+        Dimension size = super.getPreferredSize(c);
+        size.width += UIScale.scale(arrowWidth + arrowGap);
+        return size;
+    }
+}

odradek-ui/src/main/java/sh/adelessfox/odradek/ui/components/properties/BooleanProperty.java

@@ -0,0 +1,19 @@
+package sh.adelessfox.odradek.ui.components.properties;
+
+import javax.swing.*;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+
+record BooleanProperty(
+    String label,
+    Supplier<Boolean> getter,
+    Consumer<Boolean> setter
+) implements Property {
+    @Override
+    public JComponent create() {
+        var input = new JCheckBox(label);
+        input.setSelected(getter.get());
+        input.addActionListener(_ -> setter.accept(input.isSelected()));
+        return input;
+    }
+}