Merge remote-tracking branch 'origin/master'

This commit is contained in:
Konstantin Bulenkov
2015-10-06 16:06:49 +01:00
@@ -272,7 +272,7 @@ public class UISettings extends SimpleModificationTracker implements PersistentS
SystemProperties.getBooleanProperty("idea.force.use.fractional.metrics", false);
public static void setupFractionalMetrics(final Graphics2D g2d) {
if ((SystemInfo.isMac && !SystemInfo.isAppleJvm) || FORCE_USE_FRACTIONAL_METRICS) {
if (FORCE_USE_FRACTIONAL_METRICS) {
g2d.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
}
}
@@ -300,10 +300,7 @@ public class UISettings extends SimpleModificationTracker implements PersistentS
g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_OFF);
}
// We have found some issues with greyscale antialiasing on mac
if (getInstance().IDE_AA_TYPE == AntialiasingType.SUBPIXEL) {
setupFractionalMetrics(g2d);
}
}
/**