Only display touch bar on macOS 10.12 and higher (arduino#8281)

bouhali · Dec 11, 2018 · b3b62d0 · b3b62d0
1 parent 30e1466
commit b3b62d0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git 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.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
@@ -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;

diff --git 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");
+  }
 }