diff --git a/app/src/processing/app/platform/DefaultPlatform.java b/app/src/processing/app/platform/DefaultPlatform.java index ac24d6961..5be904d83 100644 --- a/app/src/processing/app/platform/DefaultPlatform.java +++ b/app/src/processing/app/platform/DefaultPlatform.java @@ -80,7 +80,8 @@ public class DefaultPlatform { public void setLookAndFeel() throws Exception { String laf = Preferences.get("editor.laf"); if (laf == null || laf.length() == 0) { // normal situation - if (shouldUseVaqua()) { + boolean isMac = System.getProperty("os.name", "").startsWith("Mac OS"); + if (isMac) { UIManager.setLookAndFeel("org.violetlib.aqua.AquaLookAndFeel"); Icon collapse = new MacTreeIcon(true); @@ -282,29 +283,4 @@ public class DefaultPlatform { } } - /** - * Determine if Vaqua swing modifications for OS X should be used. - * - * @return True if the system is compatible with Vaqua and it is preferred. False otherwise. - */ - private boolean shouldUseVaqua() { - boolean isMac = System.getProperty("os.name", "").startsWith("Mac OS"); - if (!isMac) { - return false; - } - - String fullMacVersion = System.getProperty("os.version", "NOT_AVAILABLE"); - if ("NOT_AVAILABLE".equals(fullMacVersion)) { - return false; - } - - String[] components = fullMacVersion.split("\\."); - if (components.length < 2) { - return false; - } - - int macTrain = Integer.parseInt(components[1]); - return macTrain >= 10; - } - } diff --git a/build/build.xml b/build/build.xml index 94e33eb48..2d375ab38 100644 --- a/build/build.xml +++ b/build/build.xml @@ -705,7 +705,8 @@ copyright="© The Processing Foundation" shortVersion="${version}" version="${revision}" - mainClassName="processing.app.BaseSplash"> + mainClassName="processing.app.BaseSplash" + minimumSystemVersion="10.10.0">