Skip to content

Commit dfea164

Browse files
facchinmfacchinm
authored
Merge branch 'master' into stk500-jtagice3
2 parents f9cf179 + 2870bae commit dfea164

File tree

3,109 files changed

+4436
-3823024
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,109 files changed

+4436
-3823024
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ build/windows/*.zip
2020
build/windows/*.tgz
2121
build/windows/*.tar.bz2
2222
build/windows/libastylej*
23+
build/windows/liblistSerials*
2324
build/windows/arduino-*.zip
2425
build/windows/dist/*.tar.gz
2526
build/windows/dist/*.tar.bz2

‎app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCellJPanel.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ private JTextPane makeNewDescription() {
221221
StyleSheet s = html.getStyleSheet();
222222
s.addRule("body { margin: 0; padding: 0;"
223223
+ "font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;"
224+
+ "color: black;"
224225
+ "font-size: " + 10 * Theme.getScale() / 100 + "; }");
225226
}
226227
description.setOpaque(false);

‎app/src/cc/arduino/view/SplashScreenHelper.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,12 @@ public class SplashScreenHelper {
5151

5252
public SplashScreenHelper(SplashScreen splash) {
5353
this.splash = splash;
54-
Toolkit tk = Toolkit.getDefaultToolkit();
55-
desktopHints = (Map) tk.getDesktopProperty("awt.font.desktophints");
54+
if (splash != null) {
55+
Toolkit tk = Toolkit.getDefaultToolkit();
56+
desktopHints = (Map) tk.getDesktopProperty("awt.font.desktophints");
57+
} else {
58+
desktopHints = null;
59+
}
5660
}
5761

5862
public void splashText(String text) {

0 commit comments

Comments
 (0)