Commit c6094c0

committed

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.

1 parent 08ef0a2 commit c6094c0Copy full SHA for c6094c0

File tree

1 file changed

+21

-9

lines changed

app/src/processing/app
- Base.java

1 file changed

+21

-9

lines changed

`‎app/src/processing/app/Base.java`

Lines changed: 21 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -1468,19 +1468,31 @@ public void actionPerformed(ActionEvent actionevent) {`
`1468`	`1468`	`ButtonGroup boardsButtonGroup = new ButtonGroup();`
`1469`	`1469`	`Map<String, ButtonGroup> buttonGroupsMap = new HashMap<>();`
`1470`	`1470`
	`1471`	`+ int platformCount = 0;`
	`1472`	`+ for (TargetPackage targetPackage : BaseNoGui.packages.values()) {`
	`1473`	`+ for (TargetPlatform targetPlatform : targetPackage.platforms()) {`
	`1474`	`+ ++platformCount;`
	`1475`	`+ }`
	`1476`	`+ }`
	`1477`	`+`
`1471`	`1478`	`// Cycle through all packages`
`1472`	`1479`	`for (TargetPackage targetPackage : BaseNoGui.packages.values()) {`
`1473`	`1480`	`// For every package cycle through all platform`
`1474`	`1481`	`for (TargetPlatform targetPlatform : targetPackage.platforms()) {`
`1475`		`-`
`1476`		`- // Add a title for each platform`
`1477`		`- String platformLabel = targetPlatform.getPreferences().get("name");`
`1478`		`- if (platformLabel == null)`
`1479`		`- platformLabel = targetPackage.getId() + "-" + targetPlatform.getId();`
`1480`		`-`
`1481`		`- JMenu platformBoardsMenu = new JMenu(tr(platformLabel));`
`1482`		`- MenuScroller.setScrollerFor(platformBoardsMenu);`
`1483`		`- boardMenu.add(platformBoardsMenu);`
	`1482`	`+ JMenu platformBoardsMenu;`
	`1483`	`+ if (platformCount == 1) {`
	`1484`	`+ // With just single platform, just add all platforms directly`
	`1485`	`+ platformBoardsMenu = boardMenu;`
	`1486`	`+ } else {`
	`1487`	`+ // Add a submenu for each platform`
	`1488`	`+ String platformLabel = targetPlatform.getPreferences().get("name");`
	`1489`	`+ if (platformLabel == null)`
	`1490`	`+ platformLabel = targetPackage.getId() + "-" + targetPlatform.getId();`
	`1491`	`+`
	`1492`	`+ platformBoardsMenu = new JMenu(tr(platformLabel));`
	`1493`	`+ MenuScroller.setScrollerFor(platformBoardsMenu);`
	`1494`	`+ boardMenu.add(platformBoardsMenu);`
	`1495`	`+ }`
`1484`	`1496`
`1485`	`1497`	`// Cycle through all boards of this platform`
`1486`	`1498`	`for (TargetBoard board : targetPlatform.getBoards().values()) {`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit c6094c0

File tree

1 file changed

1 file changed

`‎app/src/processing/app/Base.java`

0 commit comments