mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2025-12-06 09:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

JRE-310 check for Windows8.1 when enabling ui scale

Browse Source 
Was "don't fallback on fractional scale" in JBSDK9.

(cherry picked from commit 263d8641974d263075c93f11c4db6208754d7325)

(cherry picked from commit deeda6fada)
This commit is contained in:
Anton Tarasov
2017-10-10 18:55:59 +03:00
committed by alexey.ushakov@jetbrains.com
parent d4850568f5
commit 04c4c1245b
1 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/java.desktop/share/classes/sun/java2d/SunGraphicsEnvironment.java
View File

@@ -40,15 +40,18 @@ import java.awt.Toolkit;
import java.awt.geom.AffineTransform;
import java.awt.image.BufferedImage;
import java.awt.peer.ComponentPeer;
import java.security.PrivilegedAction;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.security.AccessController;
import java.util.Locale;
import java.util.TreeMap;
import sun.awt.DisplayChangedListener;
import sun.awt.SunDisplayChanger;
import sun.font.FontManager;
import sun.font.FontManagerFactory;
import sun.font.FontManagerForSGE;
import sun.font.*;
import sun.java2d.pipe.Region;
import sun.security.action.GetPropertyAction;
@@ -69,13 +72,38 @@ public abstract class SunGraphicsEnvironment extends GraphicsEnvironment
private static final double debugScale;
static {
uiScaleEnabled = "true".equals(AccessController.doPrivileged(
new GetPropertyAction("sun.java2d.uiScale.enabled", "true")));
uiScaleEnabled = FontUtilities.isMacOSX ||
("true".equals(AccessController.doPrivileged(
new GetPropertyAction("sun.java2d.uiScale.enabled", "true"))) &&
isWindows_8_1_orUpper());
debugScale = uiScaleEnabled ? getScaleFactor("sun.java2d.uiScale") : -1;
}
protected GraphicsDevice[] screens;
private static boolean isWindows_8_1_orUpper() {
if (!FontUtilities.isWindows) return false;
String osVersion = AccessController.doPrivileged(new GetPropertyAction("os.version"));
if (osVersion == null) return false;
String[] parts = osVersion.split("\\.");
if (parts.length < 1) return false;
try {
int majorVer = Integer.parseInt(parts[0]);
if (majorVer > 6) return true;
if (majorVer < 6) return false;
if (parts.length < 2) return false;
int minorVer = Integer.parseInt(parts[1]);
if (minorVer >= 3) return true;
} catch (NumberFormatException e) {
}
return false;
}
/**
* Returns an array of all of the screen devices.
*/