mirror of
https://github.com/processing/processing4.git
synced 2026-01-30 03:41:15 +01:00
Changed minimum mac osx version to 10.10.
Per @benfry's feedback on #88, moved to 10.10 minimum mac os x version enforced in Info.plist.
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -705,7 +705,8 @@
|
||||
copyright="© The Processing Foundation"
|
||||
shortVersion="${version}"
|
||||
version="${revision}"
|
||||
mainClassName="processing.app.BaseSplash">
|
||||
mainClassName="processing.app.BaseSplash"
|
||||
minimumSystemVersion="10.10.0">
|
||||
|
||||
<!-- The appbundler task needs a couple files (the Info.plist and
|
||||
anything else outside /jdk) from the full JDK, even though
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
<string>@@sketch@@</string>
|
||||
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>10.8.5</string>
|
||||
<string>10.10.0</string>
|
||||
|
||||
<key>NSHighResolutionCapable</key>
|
||||
<true/>
|
||||
@@ -61,7 +61,7 @@
|
||||
<array>
|
||||
@@jvm_options_list@@
|
||||
<string>-Xdock:icon=$APP_ROOT/Contents/Resources/sketch.icns</string>
|
||||
<string>-Djava.library.path=$APP_ROOT/Contents/Java</string>
|
||||
<string>-Djava.library.path=$APP_ROOT/Contents/Java</string>
|
||||
<string>-Dapple.laf.useScreenMenuBar=true</string>
|
||||
<string>-Dcom.apple.macos.use-file-dialog-packages=true</string>
|
||||
<string>-Dcom.apple.macos.useScreenMenuBar=true</string>
|
||||
|
||||
Reference in New Issue
Block a user