OpenJDK / jdk8u / jdk8u / jdk
changeset 9147:50c530973203
8012351: Bold fonts everywhere in GTK L&F on Ubuntu with JDK 7
Reviewed-by: bae, serb
| author | prr |
|---|---|
| date | Thu, 13 Feb 2014 14:44:15 -0800 |
| parents | 1b166ce167c4 |
| children | 0045fa6ff7f9 88ac42a9abe8 |
| files | src/share/classes/sun/font/FontFamily.java src/share/classes/sun/font/SunFontManager.java |
| diffstat | 2 files changed, 35 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/sun/font/FontFamily.java Thu Feb 13 22:00:42 2014 +0400 +++ b/src/share/classes/sun/font/FontFamily.java Thu Feb 13 14:44:15 2014 -0800 @@ -25,6 +25,7 @@ package sun.font; +import java.io.File; import java.awt.Font; import java.util.HashMap; import java.util.concurrent.ConcurrentHashMap; @@ -105,8 +106,39 @@ return familyRank; } + private boolean isFromSameSource(Font2D font) { + if (!(font instanceof FileFont)) { + return false; + } + + FileFont existingFont = null; + if (plain instanceof FileFont) { + existingFont = (FileFont)plain; + } else if (bold instanceof FileFont) { + existingFont = (FileFont)bold; + } else if (italic instanceof FileFont) { + existingFont = (FileFont)italic; + } else if (bolditalic instanceof FileFont) { + existingFont = (FileFont)bolditalic; + } + // A family isn't created until there's a font. + // So if we didn't find a file font it means this + // isn't a file-based family. + if (existingFont == null) { + return false; + } + File existDir = (new File(existingFont.platName)).getParentFile(); + + FileFont newFont = (FileFont)font; + File newDir = (new File(newFont.platName)).getParentFile(); + return java.util.Objects.equals(newDir, existDir); + } + public void setFont(Font2D font, int style) { - if (font.getRank() > familyRank) { + /* Allow a lower-rank font only if its a file font + * from the exact same source as any previous font. + */ + if ((font.getRank() > familyRank) && !isFromSameSource(font)) { if (FontUtilities.isLogging()) { FontUtilities.getLogger() .warning("Rejecting adding " + font +
--- a/src/share/classes/sun/font/SunFontManager.java Thu Feb 13 22:00:42 2014 +0400 +++ b/src/share/classes/sun/font/SunFontManager.java Thu Feb 13 14:44:15 2014 -0800 @@ -763,7 +763,7 @@ if (family == null) { family = new FontFamily(familyName, false, rank); family.setFont(f, f.style); - } else if (family.getRank() >= rank) { + } else { family.setFont(f, f.style); } fullNameToFont.put(fontName.toLowerCase(Locale.ENGLISH), f); @@ -854,7 +854,7 @@ if (family == null) { family = new FontFamily(familyName, false, rank); family.setFont(newFont, newFont.style); - } else if (family.getRank() >= rank) { + } else { family.setFont(newFont, newFont.style); } return newFont;