X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=getdown%2Fsrc%2Fgetdown%2Fcore%2Fsrc%2Fmain%2Fjava%2Fjalview%2Fbin%2FHiDPISetting.java;h=d6d440a363298761080ea333db85f23dc7d60fe3;hb=1a4dd17cef65c03cf088a1e5aa4520078f1daeb8;hp=4472a1904acb3e4058a4509d97134f39a0ad305d;hpb=62d10e940e86310c996659dd729aa61f7fd516fd;p=jalview.git diff --git a/getdown/src/getdown/core/src/main/java/jalview/bin/HiDPISetting.java b/getdown/src/getdown/core/src/main/java/jalview/bin/HiDPISetting.java index 4472a19..d6d440a 100644 --- a/getdown/src/getdown/core/src/main/java/jalview/bin/HiDPISetting.java +++ b/getdown/src/getdown/core/src/main/java/jalview/bin/HiDPISetting.java @@ -1,20 +1,22 @@ package jalview.bin; -import java.awt.Toolkit; +import java.awt.HeadlessException; public class HiDPISetting { - private static final int hidpiThreshold = 130; + private static final int hidpiThreshold = 160; - private static final int tallScreenThreshold = 1300; + private static final int hidpiMultiThreshold = 240; - private static final String scalePropertyName = "sun.java2d.uiScale"; + private static final int bigScreenThreshold = 1400; - private static final boolean isAMac; + public static final String scalePropertyName = "sun.java2d.uiScale"; private static final boolean isLinux; - private static final boolean isWindows; + // private static final boolean isAMac; + + // private static final boolean isWindows; public static final String setHiDPIPropertyName = "setHiDPI"; @@ -26,7 +28,7 @@ public class HiDPISetting public static int dpi = 0; - public static int maxdimension = 0; + public static int mindimension = 0; public static int width = 0; @@ -36,13 +38,23 @@ public class HiDPISetting private static boolean allowScalePropertyArg = false; + private static ScreenInfo screenInfo = new ScreenInfo(); + static { - isAMac = System.getProperty("os.name").indexOf("Mac") > -1; - isLinux = System.getProperty("os.name").toLowerCase() - .indexOf("linux") > -1; - isWindows = System.getProperty("os.name").toLowerCase() - .indexOf("windows") > -1; + String system = System.getProperty("os.name") == null ? null + : System.getProperty("os.name").toLowerCase(); + if (system != null) + { + isLinux = system.indexOf("linux") > -1; + // isAMac = system.indexOf("mac") > -1; + // isWindows = system.indexOf("windows") > -1; + } + else + { + isLinux = false; + // isAMac = isWindows = false; + } } private static void init() @@ -52,6 +64,7 @@ public class HiDPISetting return; } + // get and use command line property values first String setHiDPIProperty = System.getProperty(setHiDPIPropertyName); setHiDPI = setHiDPIProperty != null && setHiDPIProperty.equalsIgnoreCase("true"); @@ -69,65 +82,86 @@ public class HiDPISetting + setHiDPIScaleProperty + ") but not parseable as integer"); } } - - // try and get screen resolution - try + if (setHiDPI && setHiDPIScale > 0) { - dpi = Toolkit.getDefaultToolkit().getScreenResolution(); - } catch (Throwable t) + setHiDPIScale(setHiDPIScale); + return; + } + + // check to see if the scale property has already been set by something else + // (e.g. the OS) + String existingProperty = System.getProperty(scalePropertyName); + if (existingProperty != null) { - System.err.println("Cannot get screen resolution"); + try + { + int existingPropertyVal = Integer.parseInt(existingProperty); + System.out.println("Existing " + scalePropertyName + " is " + + existingPropertyVal); + if (existingPropertyVal > 1) + { + setHiDPIScale(existingPropertyVal); + return; + } + } catch (NumberFormatException e) + { + System.out.println("Could not convert property " + scalePropertyName + + " vale '" + existingProperty + "' to number"); + } } - // try and get screen size height and width + // Try and auto guess a good scale based on reported DPI (not trustworthy) + // and screen resolution (more trustworthy) + + // get screen dpi + screenInfo = getScreenInfo(); try { - int height = Toolkit.getDefaultToolkit().getScreenSize().height; - int width = Toolkit.getDefaultToolkit().getScreenSize().width; - // using maxdimension in case of portrait screens - maxdimension = Math.max(height, width); - } catch (Throwable t) + dpi = screenInfo.getScreenResolution(); + } catch (HeadlessException e) { - System.err.println("Cannot get screen size height and width"); + System.err.println("Cannot get screen resolution: " + e.getMessage()); } - if (setHiDPI && setHiDPIScale > 0) + // try and get screen size height and width + try { - scale = setHiDPIScale; - } - else + int height = screenInfo.getScreenHeight(); + int width = screenInfo.getScreenWidth(); + // using mindimension in case of portrait screens + mindimension = Math.min(height, width); + } catch (HeadlessException e) { - // attempt at a formula for scaling based on screen dpi and maxdimension. - // scale - // will be an integer >=1 - if (dpi > 0 && maxdimension > 0) - { - scale = Math.min(dpi / hidpiThreshold, - maxdimension / tallScreenThreshold) + 1; - } - else if (dpi == 0 && maxdimension > tallScreenThreshold) - { - // dpi couldn't be found but the screen has a large vertical pixel count - scale = maxdimension / tallScreenThreshold + 1; - } - /* do nothing if maxdimension == 0 -- might be just a small HD screen (e.g. Gemini PDA) - else if (maxdimension == 0 && dpi > hidpiThreshold) - { - } - */ + System.err.println( + "Cannot get screen size height and width:" + e.getMessage()); } - // only make a change if scale is changed and other conditions (OS is linux) - // apply, or if setHiDPI has been specified - allowScalePropertyArg = (scale > 1 && isLinux) || setHiDPI; + // attempt at a formula for scaling based on screen dpi and mindimension. + // scale will be an integer >=1. This formula is based on some testing and + // guesswork! - if (allowScalePropertyArg) + // scale based on reported dpi. if dpi>hidpiThreshold then scale=2+multiples + // of hidpiMultiThreshold (else scale=1) + // (e.g. dpi of 110 scales 1. dpi of 120 scales 2. dpi of 360 scales 3) + int dpiScale = (dpi - hidpiThreshold > 0) + ? 2 + ((dpi - hidpiThreshold) / hidpiMultiThreshold) + : 1; + + int dimensionScale = 1 + (mindimension / bigScreenThreshold); + + // choose larger of dimensionScale or dpiScale (most likely dimensionScale + // as dpiScale often misreported) + int autoScale = Math.max(dpiScale, dimensionScale); + + // only make an automatic change if scale is changed and other conditions + // (OS is linux) apply, or if setHiDPI has been specified + if ((autoScale > 1 && isLinux) || setHiDPI) { - System.out.println("boolean setHiDPI=" + setHiDPI); - System.out.println("DPI detected as " + dpi - + ". Scaling factor set to " + scale + "."); + setHiDPIScale(autoScale); + return; } + // looks like we're not doing any scaling doneInit = true; } @@ -138,11 +172,41 @@ public class HiDPISetting doneInit = true; } + public static String getScalePropertyArg(int s) + { + return "-D" + scalePropertyName + "=" + String.valueOf(s); + } + public static String getScalePropertyArg() { init(); // HiDPI setting. Just looking at Linux to start with. Test with Windows. - return allowScalePropertyArg ? "-D" + scalePropertyName + "=" + scale - : null; + return allowScalePropertyArg ? getScalePropertyArg(scale) : null; + } + + public static void clear() + { + setHiDPI = false; + setHiDPIScale = 0; + dpi = 0; + mindimension = 0; + width = 0; + scale = 0; + doneInit = false; + allowScalePropertyArg = false; + } + + public static void setScreenInfo(ScreenInfo si) + { + screenInfo = si; + } + + public static ScreenInfo getScreenInfo() + { + if (screenInfo == null) + { + screenInfo = new ScreenInfo(); + } + return screenInfo; } }