rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-31 20:52:13 +01:00
Code Issues Releases Activity

Merge pull request #8429 from sandeepmistry/jtouchbar-1.0.0

Browse Source 
Upgrade jtouchbar to 1.0.0
This commit is contained in:
Martino Facchin 2019-01-24 18:44:02 +01:00 committed by GitHub
commit 2ac2e23bd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/.classpath
View File

@ -52,6 +52,6 @@
<classpathentry kind="lib" path="test-lib/fest-swing-1.2.jar"/> <classpathentry kind="lib" path="test-lib/fest-swing-1.2.jar"/>
<classpathentry kind="lib" path="test-lib/fest-util-1.1.2.jar"/> <classpathentry kind="lib" path="test-lib/fest-util-1.1.2.jar"/>
<classpathentry kind="lib" path="test-lib/jcip-annotations-1.0.jar"/> <classpathentry kind="lib" path="test-lib/jcip-annotations-1.0.jar"/>
<classpathentry kind="lib" path="lib/jtouchbar-0.2.0-20180827.120213-5.jar"/> <classpathentry kind="lib" path="lib/jtouchbar-1.0.0.jar"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

BIN
app/lib/jtouchbar-0.2.0-20180827.120213-5.jar → app/lib/jtouchbar-1.0.0.jar
View File

Binary file not shown.

10
app/src/processing/app/EditorToolbar.java
View File

@ -188,7 +188,15 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
touchBarButtons[i] = new TouchBarButton(); touchBarButtons[i] = new TouchBarButton();
touchBarButtons[i].setImage(touchBarImages[i][ROLLOVER]); touchBarButtons[i].setImage(touchBarImages[i][ROLLOVER]);
touchBarButtons[i].setAction(event -> handleSelectionPressed(selection)); touchBarButtons[i].setAction(event -> {
// Run event handler later to prevent hanging if a dialog needs to be open
EventQueue.invokeLater(new Runnable() {
@Override
public void run() {
handleSelectionPressed(selection);
}
});
});
TouchBarItem touchBarItem = new TouchBarItem(title[i], touchBarButtons[i], true); TouchBarItem touchBarItem = new TouchBarItem(title[i], touchBarButtons[i], true);
touchBarItem.setCustomizationLabel(title[i]); touchBarItem.setCustomizationLabel(title[i]);

2
build/windows/launcher/config.xml
View File

@ -42,7 +42,7 @@
<cp>%EXEDIR%/lib/jackson-module-mrbean-2.9.5.jar</cp> <cp>%EXEDIR%/lib/jackson-module-mrbean-2.9.5.jar</cp>
<cp>%EXEDIR%/lib/java-semver-0.8.0.jar</cp> <cp>%EXEDIR%/lib/java-semver-0.8.0.jar</cp>
<cp>%EXEDIR%/lib/jmdns-3.5.3.jar</cp> <cp>%EXEDIR%/lib/jmdns-3.5.3.jar</cp>
<cp>%EXEDIR%/lib/jtouchbar-0.2.0-20180827.120213-5.jar</cp> <cp>%EXEDIR%/lib/jtouchbar-1.0.0.jar</cp>
<cp>%EXEDIR%/lib/slf4j-simple-1.7.22.jar</cp> <cp>%EXEDIR%/lib/slf4j-simple-1.7.22.jar</cp>
<cp>%EXEDIR%/lib/slf4j-api-1.7.22.jar</cp> <cp>%EXEDIR%/lib/slf4j-api-1.7.22.jar</cp>
<cp>%EXEDIR%/lib/jna-4.2.2.jar</cp> <cp>%EXEDIR%/lib/jna-4.2.2.jar</cp>

2
build/windows/launcher/config_debug.xml
View File

@ -42,7 +42,7 @@
<cp>%EXEDIR%/lib/jackson-module-mrbean-2.9.5.jar</cp> <cp>%EXEDIR%/lib/jackson-module-mrbean-2.9.5.jar</cp>
<cp>%EXEDIR%/lib/java-semver-0.8.0.jar</cp> <cp>%EXEDIR%/lib/java-semver-0.8.0.jar</cp>
<cp>%EXEDIR%/lib/jmdns-3.5.3.jar</cp> <cp>%EXEDIR%/lib/jmdns-3.5.3.jar</cp>
<cp>%EXEDIR%/lib/jtouchbar-0.2.0-20180827.120213-5.jar</cp> <cp>%EXEDIR%/lib/jtouchbar-1.0.0.jar</cp>
<cp>%EXEDIR%/lib/slf4j-simple-1.7.22.jar</cp> <cp>%EXEDIR%/lib/slf4j-simple-1.7.22.jar</cp>
<cp>%EXEDIR%/lib/slf4j-api-1.7.22.jar</cp> <cp>%EXEDIR%/lib/slf4j-api-1.7.22.jar</cp>
<cp>%EXEDIR%/lib/jna-4.2.2.jar</cp> <cp>%EXEDIR%/lib/jna-4.2.2.jar</cp>