Skip to content

Only display touch bar on macOS 10.12 and higher #8281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sandeepmistry merged 3 commits into from
Dec 11, 2018
Merged

Only display touch bar on macOS 10.12 and higher #8281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
feccea0
Only display touch bar on macOS 10.12 and higher
sandeepmistry Dec 10, 2018
6ef3620
Change to >= 10.12 instead of > 10.11
sandeepmistry Dec 10, 2018
3b2e41f
White space consistency
sandeepmistry Dec 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/src/processing/app/EditorToolbar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down Expand Up @@ -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) {
Expand Down
4 changes: 4 additions & 0 deletions arduino-core/src/cc/arduino/contributions/VersionComparator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions arduino-core/src/processing/app/helpers/OSUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}