feature(ui): Enable key based navigation on the JBScrollPane of the F…

…lameGraph
bric3 · Feb 6, 2022 · 7d5afcc · 7d5afcc
1 parent 7b9f05b
commit 7d5afcc
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/src/main/java/com/github/bric3/fireplace/FirePlaceMain.java b/src/main/java/com/github/bric3/fireplace/FirePlaceMain.java
@@ -130,8 +130,8 @@ public static void main(String[] args) {
         sysProps.addPropertyChangeListener("text", evt -> CompletableFuture.runAsync(() -> updateContent(sysProps, t -> t.setText(jvmSystemProperties(eventSupplier.get())))));
 
         var jTabbedPane = new JTabbedPane();
-        jTabbedPane.addTab(SYSTEM_PROPERTIES, JScrollPaneWithButton.create(sysProps));
-        jTabbedPane.addTab(NATIVE_LIBRARIES, JScrollPaneWithButton.create(nativeLibs));
+        jTabbedPane.addTab(SYSTEM_PROPERTIES, JScrollPaneWithButton.create(() -> new JScrollPane(sysProps)));
+        jTabbedPane.addTab(NATIVE_LIBRARIES, JScrollPaneWithButton.create(() -> new JScrollPane(nativeLibs)));
         jTabbedPane.addTab(ALLOCATIONS, allocationFlameGraphPanel);
         jTabbedPane.addTab(CPU, cpuFlameGraphPanel);
         jTabbedPane.setTabPlacement(JTabbedPane.BOTTOM);

diff --git a/src/main/java/com/github/bric3/fireplace/flamegraph/FlameGraph.java b/src/main/java/com/github/bric3/fireplace/flamegraph/FlameGraph.java
@@ -49,13 +49,15 @@ public FlameGraph(List<FrameBox<T>> framesSupplier,
         ToolTipManager.sharedInstance().registerComponent(canvas);
 
         component = JScrollPaneWithButton.create(
-                canvas,
-                scrollPane -> {
+                () -> {
+                    var scrollPane = new JScrollPane(canvas);
                     scrollPane.getVerticalScrollBar().setUnitIncrement(16);
                     scrollPane.getHorizontalScrollBar().setUnitIncrement(16);
-                    new ScrollPaneMouseListener<>(canvas, flameGraphPainter, extractToolTip).install(scrollPane);
+                    new FGMouseInputListener<>(canvas, flameGraphPainter, extractToolTip).install(scrollPane);
                     new MouseInputListenerWorkaroundForToolTipEnabledComponent(scrollPane).install(canvas);
                     canvas.linkListenerTo(scrollPane);
+
+                    return scrollPane;
                 }
         );
     }
@@ -77,14 +79,13 @@ public void requestRepaint() {
         canvas.triggerMinimapGeneration();
     }
 
-
-    static class ScrollPaneMouseListener<T> implements MouseInputListener {
+    static class FGMouseInputListener<T> implements MouseInputListener {
         private Point pressedPoint;
-        private FlameGraphCanvas<T> canvas;
+        private final FlameGraphCanvas<T> canvas;
         private final FlameGraphPainter<T> flameGraph;
         private final Function<FrameBox<T>, String> extractToolTip;
 
-        public ScrollPaneMouseListener(FlameGraphCanvas<T> canvas, FlameGraphPainter<T> flameGraph, Function<FrameBox<T>, String> extractToolTip) {
+        public FGMouseInputListener(FlameGraphCanvas<T> canvas, FlameGraphPainter<T> flameGraph, Function<FrameBox<T>, String> extractToolTip) {
             this.canvas = canvas;
             this.flameGraph = flameGraph;
             this.extractToolTip = extractToolTip;
@@ -156,7 +157,12 @@ public void mouseClicked(MouseEvent e) {
         }
 
         @Override
-        public void mouseEntered(MouseEvent e) {}
+        public void mouseEntered(MouseEvent e) {
+            // this seems to enable key navigation
+            if ((e.getComponent() instanceof JScrollPane)) {
+                e.getComponent().requestFocus();
+            }
+        }
 
         @Override
         public void mouseExited(MouseEvent e) {
@@ -165,7 +171,6 @@ public void mouseExited(MouseEvent e) {
                 flameGraph.stopHover();
                 scrollPane.repaint();
             }
-
         }
 
         @Override

diff --git a/src/main/java/com/github/bric3/fireplace/ui/JScrollPaneWithButton.java b/src/main/java/com/github/bric3/fireplace/ui/JScrollPaneWithButton.java
@@ -14,18 +14,13 @@
 import java.awt.*;
 import java.awt.event.MouseEvent;
 import java.awt.geom.Path2D;
-import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 public abstract class JScrollPaneWithButton {
 
-    public static JLayer<JScrollPane> create(JComponent content, Consumer<JScrollPane> scrollPaneModifier) {
-        var jScrollPane = new JScrollPane(content);
-        scrollPaneModifier.accept(jScrollPane);
-        return new JLayer<>(jScrollPane, new ScrollBackToTopLayerUI(15, 15));
-    }
-
-    public static JLayer<JScrollPane> create(JComponent content) {
-        return create(content, sp -> {});
+    public static JLayer<JScrollPane> create(Supplier<JScrollPane> scrollPaneSupplier) {
+        return new JLayer<>(scrollPaneSupplier.get(),
+                            new ScrollBackToTopLayerUI(15, 15));
     }
 
     private static class ScrollBackToTopLayerUI extends LayerUI<JScrollPane> {