From a908b7b0d922f7b76574cb34bb9bd8892a91c8ca Mon Sep 17 00:00:00 2001
From: Joe Wegner <jwegner@aph.org>
Date: Fri, 23 Aug 2019 10:26:24 -0400
Subject: [PATCH] A way to make the scrolling menu on Tools | Boards menu more
 accessible friendly - but it's ugly

---
 .../processing/app/tools/MenuScroller.java    | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/app/src/processing/app/tools/MenuScroller.java b/app/src/processing/app/tools/MenuScroller.java
index 3523ec7ceca..17502292744 100644
--- a/app/src/processing/app/tools/MenuScroller.java
+++ b/app/src/processing/app/tools/MenuScroller.java
@@ -3,6 +3,8 @@
  */
 package processing.app.tools;
 
+import processing.app.PreferencesData;
+
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
@@ -278,6 +280,9 @@ public MenuScroller(JPopupMenu menu, int scrollCount, int interval,
       scrollCount = autoSizeScrollCount;
     }
 
+//    if (PreferencesData.getBoolean("ide.accessible")) {
+//      interval = 1000;
+//    }
     if (scrollCount <= 0 || interval <= 0) {
       throw new IllegalArgumentException("scrollCount and interval must be greater than 0");
     }
@@ -567,6 +572,29 @@ public MenuScrollTimer(final int increment, int interval) {
         public void actionPerformed(ActionEvent e) {
           firstIndex += increment * accelerator;
           refreshMenu();
+          if (PreferencesData.getBoolean("ide.accessible")) {
+            String    itemClassName;
+            int keyEvent;
+            if (increment > 0) {
+              itemClassName = menuItems[firstIndex + scrollCount - 1].getClass().getName();
+              keyEvent = KeyEvent.VK_UP;
+            }
+            else {
+              itemClassName = menuItems[firstIndex].getClass().getName();
+              keyEvent = KeyEvent.VK_DOWN;
+            }
+
+            // if next item is a separator just go on like normal, otherwise move the cursor back to that item is read
+            // by a screen reader and the user can continue to use their arrow keys to navigate the list
+            if (!itemClassName.equals(JSeparator.class.getName()) ) {
+              KeyboardFocusManager manager = KeyboardFocusManager.getCurrentKeyboardFocusManager();
+              Component comp = manager.getFocusOwner();
+              KeyEvent event = new KeyEvent(comp,
+                KeyEvent.KEY_PRESSED, System.currentTimeMillis(), 0,
+                keyEvent, KeyEvent.CHAR_UNDEFINED);
+              comp.dispatchEvent(event);
+            }
+          }
         }
       });
     }