changeset 11699:979b0634e600

8078382: Wrong glyph is displayed for a derived font Reviewed-by: prr, serb
author bae
date Fri, 03 Jun 2016 12:46:32 +0300
parents 0995193fd302
children 1d346a5b8a11 7ced0993caf4
files src/share/classes/sun/font/FontFamily.java
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/font/FontFamily.java	Thu Jun 02 21:08:17 2016 +0530
+++ b/src/share/classes/sun/font/FontFamily.java	Fri Jun 03 12:46:32 2016 +0300
@@ -335,10 +335,10 @@
         case Font.BOLD|Font.ITALIC:
             if (bolditalic != null) {
                 return bolditalic;
+            } else if (bold != null && bold.canDoStyle(style)) {
+                return bold;
             } else if (italic != null && italic.canDoStyle(style)) {
                     return italic;
-            } else if (bold != null && bold.canDoStyle(style)) {
-                    return italic;
             } else if (plain != null && plain.canDoStyle(style)) {
                     return plain;
             } else {