diff --git a/src/main/java/org/scijava/ui/swing/widget/SwingInputPanel.java b/src/main/java/org/scijava/ui/swing/widget/SwingInputPanel.java index 3b7542b..1d6491f 100644 --- a/src/main/java/org/scijava/ui/swing/widget/SwingInputPanel.java +++ b/src/main/java/org/scijava/ui/swing/widget/SwingInputPanel.java @@ -29,24 +29,38 @@ package org.scijava.ui.swing.widget; +import java.awt.Component; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import javax.swing.JLabel; import javax.swing.JPanel; import net.miginfocom.swing.MigLayout; +import org.scijava.ItemVisibility; import org.scijava.widget.AbstractInputPanel; import org.scijava.widget.InputPanel; import org.scijava.widget.InputWidget; import org.scijava.widget.WidgetModel; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; + /** * Swing implementation of {@link InputPanel}. * * @author Curtis Rueden + * @author Karl Duderstadt */ public class SwingInputPanel extends AbstractInputPanel { private JPanel uiComponent; + + private Map> widgetGroups; + private Map widgetGroupVisible; // -- InputPanel methods -- @@ -55,20 +69,101 @@ public void addWidget(final InputWidget widget) { super.addWidget(widget); final JPanel widgetPane = widget.getComponent(); final WidgetModel model = widget.get(); - + final String group = (model.getItem().getVisibility() == ItemVisibility.GROUP) ? (String) model.getValue() : model.getGroup(); + + if (widgetGroups == null) + widgetGroups = new HashMap>(); + + if (widgetGroupVisible == null) + widgetGroupVisible = new HashMap(); + + if (!widgetGroups.containsKey(group)) + widgetGroups.put(group, new ArrayList()); + // add widget to panel - if (widget.isLabeled()) { + if (model.getItem().getVisibility() == ItemVisibility.GROUP) { + JPanel labelPanel = new JPanel(new MigLayout("fillx,insets 5 15 5 15, gapy 0")); + JLabel label = (model.getItem().isExpanded()) ? new JLabel("▼ " + group + "") : + new JLabel("▶ " + group + ""); + + widgetGroupVisible.put(group, model.getItem().isExpanded()); + + label.addMouseListener(new MouseAdapter() { + /** + * Invoked when the mouse button has been clicked (pressed + * and released) on a component. + * @param e the event to be processed + */ + @Override + public void mouseClicked(MouseEvent e) { + } + + /** + * Invoked when a mouse button has been pressed on a component. + * @param e the event to be processed + */ + @Override + public void mousePressed(MouseEvent e) { + widgetGroupVisible.put(group, !widgetGroupVisible.get(group)); + widgetGroups.get(group).forEach(comp -> comp.setVisible(widgetGroupVisible.get(group))); + + if(widgetGroupVisible.get(group)) + label.setText("▼ " + group + ""); + else + label.setText("▶ " + group + ""); + + getComponent().revalidate(); + } + + /** + * Invoked when a mouse button has been released on a component. + * @param e the event to be processed + */ + @Override + public void mouseReleased(MouseEvent e) { + } + + /** + * Invoked when the mouse enters a component. + * @param e the event to be processed + */ + @Override + public void mouseEntered(MouseEvent e) { + } + + /** + * Invoked when the mouse exits a component. + * @param e the event to be processed + */ + @Override + public void mouseExited(MouseEvent e) { + } + + }); + + labelPanel.add(label); + getComponent().add(labelPanel, "align left, wrap"); + } + else if (widget.isLabeled()) { // widget is prefixed by a label final JLabel l = new JLabel(model.getWidgetLabel()); final String desc = model.getItem().getDescription(); if (desc != null && !desc.isEmpty()) l.setToolTipText(desc); - getComponent().add(l); - getComponent().add(widgetPane); + getComponent().add(l, "hidemode 3"); + widgetGroups.get(group).add(l); + + getComponent().add(widgetPane, "hidemode 3"); + widgetGroups.get(group).add(widgetPane); } else { // widget occupies entire row - getComponent().add(widgetPane, "span"); + getComponent().add(widgetPane, "span, hidemode 3"); + widgetGroups.get(group).add(widgetPane); } + + //Make sure components have correct starting visibility + if (widgetGroups.containsKey(group) && widgetGroupVisible.containsKey(group)) + widgetGroups.get(group).forEach(comp -> comp.setVisible(widgetGroupVisible.get(group))); } @Override