github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-25 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Partial fix for macOS fullscreen support. For #9354.

Browse source
This commit is contained in:
Alex Vasile 2022-08-05 11:21:12 -04:00
parent 8b71e0a444
commit 1d0bcb49ad
3 changed files with 72 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Mage.Client/src/main/java/mage/client/MageFrame.java
View file

@ -349,10 +349,10 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
setWindowTitle();
});
if (SystemUtil.isMacOSX()) {
SystemUtil.enableMacOSFullScreenMode(this);
if (MacFullscreenUtil.isMacOSX()) {
MacFullscreenUtil.enableMacOSFullScreenMode(this);
if (fullscreenMode) {
SystemUtil.toggleMacOSFullScreenMode(this);
MacFullscreenUtil.toggleMacOSFullScreenMode(this);
}
}
}

69
Mage.Client/src/main/java/mage/client/util/MacFullscreenUtil.java Normal file
View file

@ -0,0 +1,69 @@
package mage.client.util;
import java.awt.*;
import java.lang.reflect.Method;
/**
* @author noxx
*/
public final class MacFullscreenUtil {
public static final String OS_NAME = "os.name";
public static final String MAC_OS_X = "Mac OS X";
private MacFullscreenUtil() {}
public static boolean isMacOSX() {
return System.getProperty(OS_NAME).contains(MAC_OS_X);
}
public static void enableMacOSFullScreenMode(Window window) {
if (supportsAppleEAWT()) {
String className = "com.apple.eawt.FullScreenUtilities";
String methodName = "setWindowCanFullScreen";
try {
Class<?> clazz = Class.forName(className);
Method method = clazz.getMethod(methodName, Window.class, boolean.class);
method.invoke(null, window, true);
} catch (Throwable t) {
System.err.println("Full screen mode is not supported");
t.printStackTrace();
}
} else {
// Nothing needed. Running with Java 11+ (even when compiled for 1.8) automatically allows for full screen toggling.
}
}
public static void toggleMacOSFullScreenMode(Window window) {
if (supportsAppleEAWT()) {
String className = "com.apple.eawt.Application";
String methodName = "getApplication";
String methodName2 = "requestToggleFullScreen";
try {
Class<?> clazz = Class.forName(className);
Method method = clazz.getMethod(methodName);
Object appInstance = method.invoke(clazz);
Class[] params = new Class[]{Window.class};
method = clazz.getMethod(methodName2, params);
method.invoke(appInstance, window);
} catch (Throwable t) {
System.err.println("Full screen mode is not supported");
t.printStackTrace();
}
} else {
// TODO: Need a solution for automatically entering fullscreen under Java 11+
// The other approach given online does not work, it will not provide native fullscreen that you can toggle out of:
// GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
// if (gd.isFullScreenSupported()) {
// gd.setFullScreenWindow(window);
// }
}
}
private static boolean supportsAppleEAWT() {
return System.getProperty("java.version").startsWith("1.8");
}
}

57
Mage.Client/src/main/java/mage/client/util/SystemUtil.java
View file

@ -1,57 +0,0 @@
package mage.client.util;
import java.awt.*;
import java.lang.reflect.Method;
/**
* @author noxx
*/
public final class SystemUtil {
public static final String OS_NAME = "os.name";
public static final String MAC_OS_X = "Mac OS X";
private SystemUtil() {
}
public static boolean isMacOSX() {
return System.getProperty(OS_NAME).contains(MAC_OS_X);
}
public static void enableMacOSFullScreenMode(Window window) {
String className = "com.apple.eawt.FullScreenUtilities";
String methodName = "setWindowCanFullScreen";
try {
Class<?> clazz = Class.forName(className);
Method method = clazz.getMethod(methodName, Window.class, boolean.class);
method.invoke(null, window, true);
} catch (Throwable t) {
System.err.println("Full screen mode is not supported");
t.printStackTrace();
}
}
public static void toggleMacOSFullScreenMode(Window window) {
String className = "com.apple.eawt.Application";
String methodName = "getApplication";
String methodName2 = "requestToggleFullScreen";
try {
Class<?> clazz = Class.forName(className);
Method method = clazz.getMethod(methodName);
Object appInstance = method.invoke(clazz);
Class[] params = new Class[]{Window.class};
method = clazz.getMethod(methodName2, params);
method.invoke(appInstance, window);
} catch (Throwable t) {
System.err.println("Full screen mode is not supported");
t.printStackTrace();
}
}
public static void main(String... args) {
System.out.println(isMacOSX());
}
}