Removed getLoadedGtkVersion() (GTK logic/reflection doesn't belong in this class)

This commit is contained in:
Robinson 2021-03-11 22:08:40 +01:00
parent 66fbb0c861
commit 751fd2c982

View File

@ -29,7 +29,6 @@ import java.awt.event.HierarchyListener;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.awt.event.WindowListener; import java.awt.event.WindowListener;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.util.Locale; import java.util.Locale;
@ -42,8 +41,6 @@ import javax.swing.JRootPane;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import javax.swing.UIManager; import javax.swing.UIManager;
import dorkbox.os.OS;
@SuppressWarnings("unused") @SuppressWarnings("unused")
public public
class SwingUtil { class SwingUtil {
@ -168,67 +165,6 @@ class SwingUtil {
.equals(UIManager.getSystemLookAndFeelClassName()); .equals(UIManager.getSystemLookAndFeelClassName());
} }
/**
* Checks to see if GTK is loaded by Swing, and if so - which version is loaded.
*
* NOTE: if the UI uses the 'getSystemLookAndFeelClassName' and is on Linux and it's the GtkLookAndFeel, this will cause GTK2
* to get loaded first, which will cause conflicts if one tries to use GTK3
*
* @return the version of GTK loaded (if any) otherwise 0 for no version of GTK is loaded
*/
public static
int getLoadedGtkVersion() {
// is GTK already loaded by java?
boolean isGtkAlreadyLoadedByJava = false;
try {
// Don't want to load the toolkit!!!
Class<?> toolkitClass = Class.forName("java.awt.Toolkit");
Field kitField = toolkitClass.getDeclaredField("toolkit");
kitField.setAccessible(true);
Object toolkit = kitField.get(null);
if (toolkit != null) {
Class<?> unixTkClazz = Class.forName("sun.awt.UNIXToolkit");
if (unixTkClazz.isAssignableFrom(toolkit.getClass())) {
Field field = unixTkClazz.getDeclaredField("nativeGTKLoaded");
field.setAccessible(true);
Boolean o = (Boolean) field.get(toolkit);
if (o != null) {
//noinspection UnnecessaryUnboxing
isGtkAlreadyLoadedByJava = o.booleanValue();
}
}
}
} catch (Throwable ignored) {
}
if (isGtkAlreadyLoadedByJava) {
// THIS IS NOT DOCUMENTED ANYWHERE...
String swingGtkVersion = System.getProperty("swing.gtk.version");
if (swingGtkVersion != null && swingGtkVersion.length() > 1) {
char c = swingGtkVersion.charAt(0);
if (MathUtil.isNumber(c)) {
return (int) c;
}
}
if (OS.javaVersion >= 9) {
String property = System.getProperty("jdk.gtk.version", "2");
if (property != null) {
char c = property.charAt(0);
if (MathUtil.isNumber(c)) {
return (int) c;
}
}
}
// by default, this is the version GTK java uses (if none of the properties are set, but GTK is loaded)
return 2;
}
return 0;
}
/** used when setting various icon components in the GUI to "nothing", since null doesn't work */ /** used when setting various icon components in the GUI to "nothing", since null doesn't work */
public static final Image BLANK_ICON = new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB_PRE); public static final Image BLANK_ICON = new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB_PRE);