Merge pull request arduino#11425 from facchinm/scrollable_custommenus

cmaglie · web-flow · commit 488f0d7ab2af · 2021-04-30T17:10:54.000+02:00
Make Custom menus scrollable
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
@@ -1473,6 +1473,7 @@ public void actionPerformed(ActionEvent actionevent) {
           customMenu.putClientProperty("platform", getPlatformUniqueId(targetPlatform));
           customMenu.putClientProperty("removeOnWindowDeactivation", true);
           boardsCustomMenus.add(customMenu);
+          MenuScroller.setScrollerFor(customMenu);
         }
       }
     }
diff --git a/app/src/processing/app/tools/MenuScroller.java b/app/src/processing/app/tools/MenuScroller.java
@@ -16,6 +16,7 @@
 import java.awt.event.MouseWheelEvent;
 import java.awt.event.MouseWheelListener;
 import java.awt.event.KeyEvent;
+import java.util.Arrays;
 
 /**
  * A class that provides scrolling capabilities to a long menu dropdown or
@@ -33,6 +34,7 @@ public class MenuScroller {
 
   private JPopupMenu menu;
   private Component[] menuItems;
+  private Component[] allMenuItems;
   private MenuScrollItem upItem;
   private MenuScrollItem downItem;
   private final MenuScrollListener menuListener = new MenuScrollListener();
@@ -539,7 +541,8 @@ public void popupMenuCanceled(PopupMenuEvent e) {
     }
 
     private void setMenuItems() {
-      menuItems = menu.getComponents();
+      allMenuItems = menu.getComponents();
+      menuItems = Arrays.stream(allMenuItems).filter(x -> x.isVisible()).toArray(Component[]::new);
       if (keepVisibleIndex >= topFixedCount
         && keepVisibleIndex <= menuItems.length - bottomFixedCount
         && (keepVisibleIndex > firstIndex + scrollCount
@@ -554,7 +557,7 @@ private void setMenuItems() {
 
     private void restoreMenuItems() {
       menu.removeAll();
-      for (Component component : menuItems) {
+      for (Component component : allMenuItems) {
         menu.add(component);
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -1473,6 +1473,7 @@ public void actionPerformed(ActionEvent actionevent) {`
`1473`	`1473`	`customMenu.putClientProperty("platform", getPlatformUniqueId(targetPlatform));`
`1474`	`1474`	`customMenu.putClientProperty("removeOnWindowDeactivation", true);`
`1475`	`1475`	`boardsCustomMenus.add(customMenu);`
	`1476`	`+ MenuScroller.setScrollerFor(customMenu);`
`1476`	`1477`	`}`
`1477`	`1478`	`}`
`1478`	`1479`	`}`