Commit 2ac2e23

authored

Merge pull request #8429 from sandeepmistry/jtouchbar-1.0.0

Upgrade jtouchbar to 1.0.0

2 parents 3ba8583 + 3c8f201 commit 2ac2e23Copy full SHA for 2ac2e23

File tree

+12

-4

lines changed

+12

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,6 @@`
`52`	`52`	`<classpathentry kind="lib" path="test-lib/fest-swing-1.2.jar"/>`
`53`	`53`	`<classpathentry kind="lib" path="test-lib/fest-util-1.1.2.jar"/>`
`54`	`54`	`<classpathentry kind="lib" path="test-lib/jcip-annotations-1.0.jar"/>`
`55`		`- <classpathentry kind="lib" path="lib/jtouchbar-0.2.0-20180827.120213-5.jar"/>`
	`55`	`+ <classpathentry kind="lib" path="lib/jtouchbar-1.0.0.jar"/>`
`56`	`56`	`<classpathentry kind="output" path="bin"/>`
`57`	`57`	`</classpath>`

317 KB

Binary file not shown.

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,15 @@ private void buildTouchBar() {`
`188`	`188`
`189`	`189`	`touchBarButtons[i] = new TouchBarButton();`
`190`	`190`	`touchBarButtons[i].setImage(touchBarImages[i][ROLLOVER]);`
`191`		`- touchBarButtons[i].setAction(event -> handleSelectionPressed(selection));`
	`191`	`+ touchBarButtons[i].setAction(event -> {`
	`192`	`+ // Run event handler later to prevent hanging if a dialog needs to be open`
	`193`	`+ EventQueue.invokeLater(new Runnable() {`
	`194`	`+ @Override`
	`195`	`+ public void run() {`
	`196`	`+ handleSelectionPressed(selection);`
	`197`	`+ }`
	`198`	`+ });`
	`199`	`+ });`
`192`	`200`
`193`	`201`	`TouchBarItem touchBarItem = new TouchBarItem(title[i], touchBarButtons[i], true);`
`194`	`202`	`touchBarItem.setCustomizationLabel(title[i]);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`<cp>%EXEDIR%/lib/jackson-module-mrbean-2.9.5.jar</cp>`
`43`	`43`	`<cp>%EXEDIR%/lib/java-semver-0.8.0.jar</cp>`
`44`	`44`	`<cp>%EXEDIR%/lib/jmdns-3.5.3.jar</cp>`
`45`		`- <cp>%EXEDIR%/lib/jtouchbar-0.2.0-20180827.120213-5.jar</cp>`
	`45`	`+ <cp>%EXEDIR%/lib/jtouchbar-1.0.0.jar</cp>`
`46`	`46`	`<cp>%EXEDIR%/lib/slf4j-simple-1.7.22.jar</cp>`
`47`	`47`	`<cp>%EXEDIR%/lib/slf4j-api-1.7.22.jar</cp>`
`48`	`48`	`<cp>%EXEDIR%/lib/jna-4.2.2.jar</cp>`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`<cp>%EXEDIR%/lib/jackson-module-mrbean-2.9.5.jar</cp>`
`43`	`43`	`<cp>%EXEDIR%/lib/java-semver-0.8.0.jar</cp>`
`44`	`44`	`<cp>%EXEDIR%/lib/jmdns-3.5.3.jar</cp>`
`45`		`- <cp>%EXEDIR%/lib/jtouchbar-0.2.0-20180827.120213-5.jar</cp>`
	`45`	`+ <cp>%EXEDIR%/lib/jtouchbar-1.0.0.jar</cp>`
`46`	`46`	`<cp>%EXEDIR%/lib/slf4j-simple-1.7.22.jar</cp>`
`47`	`47`	`<cp>%EXEDIR%/lib/slf4j-api-1.7.22.jar</cp>`
`48`	`48`	`<cp>%EXEDIR%/lib/jna-4.2.2.jar</cp>`

Comments

(0)