1
0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-13 10:29:35 +01:00

Do not use a boards submenu with just one platform

When just one platform is installed, it does not make much sense to use
a submenu, so just add the boards directly under the boards menu as
before.
This commit is contained in:
Matthijs Kooijman 2019-09-19 17:03:34 +02:00 committed by Cristian Maglie
parent 7bcd76332e
commit 6c1100f9ec

View File

@ -1511,10 +1511,21 @@ public class Base {
}
JMenuItem firstBoardItem = null;
for (JMenu platformMenu : platformMenus) {
if (firstBoardItem == null && platformMenu.getItemCount() > 0)
firstBoardItem = platformMenu.getItem(0);
boardMenu.add(platformMenu);
if (platformMenus.size() == 1) {
// When just one platform exists, add the board items directly,
// rather than using a submenu
for (Component boardItem : platformMenus.get(0).getMenuComponents()) {
boardMenu.add(boardItem);
if (firstBoardItem == null)
firstBoardItem = (JMenuItem)boardItem;
}
} else {
// For multiple platforms, use submenus
for (JMenu platformMenu : platformMenus) {
if (firstBoardItem == null && platformMenu.getItemCount() > 0)
firstBoardItem = platformMenu.getItem(0);
boardMenu.add(platformMenu);
}
}
if (firstBoardItem == null) {