3030package org .scijava .ui .swing .console ;
3131
3232import java .awt .BorderLayout ;
33+ import java .awt .Font ;
3334import java .awt .event .FocusEvent ;
3435import java .awt .event .FocusListener ;
3536import java .util .Arrays ;
4748import java .util .stream .Collectors ;
4849import java .util .stream .Stream ;
4950
50- import javax .swing .JButton ;
51- import javax .swing .JComponent ;
52- import javax .swing .JFrame ;
53- import javax .swing .JLabel ;
54- import javax .swing .JMenuItem ;
55- import javax .swing .JPanel ;
56- import javax .swing .JPopupMenu ;
57- import javax .swing .JScrollPane ;
58- import javax .swing .JTree ;
51+ import javax .swing .*;
5952import javax .swing .event .TreeSelectionEvent ;
6053import javax .swing .tree .DefaultMutableTreeNode ;
6154import javax .swing .tree .DefaultTreeCellRenderer ;
6255import javax .swing .tree .DefaultTreeModel ;
6356import javax .swing .tree .TreePath ;
6457
58+ import com .formdev .flatlaf .FlatClientProperties ;
59+ import com .formdev .flatlaf .FlatLaf ;
60+
6561import net .miginfocom .swing .MigLayout ;
6662
6763import org .scijava .log .LogLevel ;
@@ -89,20 +85,31 @@ class LogSourcesPanel extends JPanel {
8985
9086 private Predicate <LogMessage > filter = message -> true ;
9187 private Runnable changeListener = null ;
92- private List <LogSource > selected ;
88+ private List <LogSource > selected = Collections . emptyList () ;
9389
9490 // -- constructor --
9591
96- LogSourcesPanel (JButton reloadButton ) {
92+ LogSourcesPanel (JButton reloadButton , Runnable toggleAction ) {
9793 initMenu ();
9894 initTreeView ();
99- JButton visibilityButton = initVisibilityButton ();
100- setLayout (new MigLayout ("inset 0" , "[grow]" , "[][grow][]" ));
101- add (new JLabel ("Log Sources:" ), "grow, wrap" );
95+ final JButton visibilityButton = initVisibilityButton ();
96+ final JButton collapseButton = new JButton ("\u2715 " );
97+ collapseButton .addActionListener (a -> toggleAction .run ());
98+
99+ visibilityButton .putClientProperty (FlatClientProperties .STYLE_CLASS , "small" );
100+ reloadButton .putClientProperty (FlatClientProperties .STYLE_CLASS , "small" );
101+ collapseButton .putClientProperty (FlatClientProperties .STYLE_CLASS , "small" );
102+
103+ final JToolBar toolBar = new JToolBar ();
104+ toolBar .setFloatable (false );
105+ toolBar .add (collapseButton );
106+ toolBar .add (Box .createHorizontalGlue ());
107+ toolBar .add (reloadButton );
108+ toolBar .add (visibilityButton );
109+ // tree takes the free height, the toolbar keeps its preferred height
110+ setLayout (new MigLayout ("inset 0" , "[grow]" , "[grow][]" ));
102111 add (new JScrollPane (tree ), "grow, wrap" );
103- add (new JLabel ("" ), "split 3, grow" );
104- add (reloadButton );
105- add (visibilityButton );
112+ add (toolBar , "growx" );
106113 actionWhenFocusLost (() -> tree .clearSelection (), Arrays .asList (tree , visibilityButton ));
107114 }
108115
@@ -129,11 +136,14 @@ private void initTreeView() {
129136 treeModel = new DefaultTreeModel (rootNode );
130137 tree = new JTree (treeModel );
131138 tree .setRootVisible (false );
132- DefaultTreeCellRenderer cellRenderer = new DefaultTreeCellRenderer ();
133- cellRenderer .setIcon (null );
134- cellRenderer .setLeafIcon (null );
135- cellRenderer .setOpenIcon (null );
136- tree .setCellRenderer (cellRenderer );
139+ // NB: FlatLaf trees have no default icons, so keep its own renderer
140+ if (!(UIManager .getLookAndFeel () instanceof FlatLaf )) {
141+ DefaultTreeCellRenderer cellRenderer = new DefaultTreeCellRenderer ();
142+ cellRenderer .setIcon (null );
143+ cellRenderer .setLeafIcon (null );
144+ cellRenderer .setOpenIcon (null );
145+ tree .setCellRenderer (cellRenderer );
146+ }
137147 tree .setComponentPopupMenu (menu );
138148 tree .setEditable (false );
139149 tree .setShowsRootHandles (true );
@@ -146,7 +156,8 @@ private void selectionChanged(TreeSelectionEvent treeSelectionEvent) {
146156 }
147157
148158 private JButton initVisibilityButton () {
149- JButton button = new JButton ("Visibility" );
159+ JButton button = new JButton ("Visibility \u25BE " );
160+ button .setToolTipText ("Set which log levels are shown for the selected sources" );
150161 button .addActionListener (a -> menu .show (button , 0 , button .getHeight ()));
151162 return button ;
152163 }
@@ -340,7 +351,7 @@ static Level of(int x) {
340351
341352 public static void main (String ... args ) {
342353 JFrame frame = new JFrame ();
343- LogSourcesPanel logLevelPanel = new LogSourcesPanel (new JButton ("dummy" ));
354+ LogSourcesPanel logLevelPanel = new LogSourcesPanel (new JButton ("dummy" ), null );
344355 LogSource root = LogSource .newRoot ();
345356 Set <LogSource > loggers = new HashSet <>(Arrays .asList (
346357 root .subSource ("Hello:World" ),
0 commit comments