From feccea0b78c07109920c295ce57144995bb75811 Mon Sep 17 00:00:00 2001 From: Sandeep Mistry Date: Mon, 10 Dec 2018 10:00:16 -0500 Subject: [PATCH 1/3] Only display touch bar on macOS 10.12 and higher --- app/src/processing/app/EditorToolbar.java | 3 ++- arduino-core/src/processing/app/helpers/OSUtils.java | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/processing/app/EditorToolbar.java b/app/src/processing/app/EditorToolbar.java index 45e075b55c0..daad38cbdf9 100644 --- a/app/src/processing/app/EditorToolbar.java +++ b/app/src/processing/app/EditorToolbar.java @@ -31,6 +31,7 @@ import com.thizzer.jtouchbar.item.TouchBarItem; import com.thizzer.jtouchbar.item.view.TouchBarButton; +import cc.arduino.contributions.VersionComparator; import processing.app.helpers.OSUtils; import java.awt.*; @@ -149,7 +150,7 @@ public EditorToolbar(Editor editor, JMenu menu) { statusFont = Theme.getFont("buttons.status.font"); statusColor = Theme.getColor("buttons.status.color"); - if (OSUtils.isMacOS()) { + if (OSUtils.isMacOS() && VersionComparator.greaterThan(OSUtils.version(), "10.11")) { editor.addWindowListener(new WindowAdapter() { public void windowActivated(WindowEvent e) { if (touchBar == null) { diff --git a/arduino-core/src/processing/app/helpers/OSUtils.java b/arduino-core/src/processing/app/helpers/OSUtils.java index be6cccd6b75..25a66dc94b2 100644 --- a/arduino-core/src/processing/app/helpers/OSUtils.java +++ b/arduino-core/src/processing/app/helpers/OSUtils.java @@ -29,4 +29,8 @@ static public boolean isMacOS() { static public boolean hasMacOSStyleMenus() { return OSUtils.isMacOS() && "true".equals(System.getProperty("apple.laf.useScreenMenuBar")); } + + static public String version() { + return System.getProperty("os.version"); + } } From 6ef36205381aadf8c1cd3ebff8f9bb964afde495 Mon Sep 17 00:00:00 2001 From: Sandeep Mistry Date: Mon, 10 Dec 2018 12:15:30 -0500 Subject: [PATCH 2/3] Change to >= 10.12 instead of > 10.11 --- app/src/processing/app/EditorToolbar.java | 2 +- .../src/cc/arduino/contributions/VersionComparator.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/processing/app/EditorToolbar.java b/app/src/processing/app/EditorToolbar.java index daad38cbdf9..5dede700a78 100644 --- a/app/src/processing/app/EditorToolbar.java +++ b/app/src/processing/app/EditorToolbar.java @@ -150,7 +150,7 @@ public EditorToolbar(Editor editor, JMenu menu) { statusFont = Theme.getFont("buttons.status.font"); statusColor = Theme.getColor("buttons.status.color"); - if (OSUtils.isMacOS() && VersionComparator.greaterThan(OSUtils.version(), "10.11")) { + if (OSUtils.isMacOS() && VersionComparator.greaterThanOrEqual(OSUtils.version(), "10.12")) { editor.addWindowListener(new WindowAdapter() { public void windowActivated(WindowEvent e) { if (touchBar == null) { diff --git a/arduino-core/src/cc/arduino/contributions/VersionComparator.java b/arduino-core/src/cc/arduino/contributions/VersionComparator.java index ba0ebb639c7..c9ec5ca81b9 100644 --- a/arduino-core/src/cc/arduino/contributions/VersionComparator.java +++ b/arduino-core/src/cc/arduino/contributions/VersionComparator.java @@ -61,6 +61,10 @@ public int compare(String a, String b) { public static boolean greaterThan(String a, String b) { return compareTo(a, b) > 0; } + + public static boolean greaterThanOrEqual(String a, String b) { + return compareTo(a, b) >= 0; + } public static String max(String a, String b) { return greaterThan(a, b) ? a : b; From 3b2e41fd6e8212e48fba15da3d3e1c0f6a8c42d1 Mon Sep 17 00:00:00 2001 From: Sandeep Mistry Date: Tue, 11 Dec 2018 09:27:24 -0500 Subject: [PATCH 3/3] White space consistency --- arduino-core/src/processing/app/helpers/OSUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arduino-core/src/processing/app/helpers/OSUtils.java b/arduino-core/src/processing/app/helpers/OSUtils.java index 25a66dc94b2..b063b18deb7 100644 --- a/arduino-core/src/processing/app/helpers/OSUtils.java +++ b/arduino-core/src/processing/app/helpers/OSUtils.java @@ -29,8 +29,8 @@ static public boolean isMacOS() { static public boolean hasMacOSStyleMenus() { return OSUtils.isMacOS() && "true".equals(System.getProperty("apple.laf.useScreenMenuBar")); } - + static public String version() { - return System.getProperty("os.version"); + return System.getProperty("os.version"); } }