JBR-5946 Allow to disable painting of composed text in Swing text components using TextLayout.draw

(cherry picked from commit 81d531fb9f7496498fcab1f0e76554885941f16c)

1 files changed, 5 insertions, 1 deletions

diff --git a/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java b/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java
index 5e7815b66af..28cbadf40e2 100644
--- a/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java
+++ b/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java
@@ -1010,7 +1010,11 @@ public class SwingUtilities2 {
             } else {
                 layout = new TextLayout(iterator, frc);
             }
-            layout.draw(g2d, x, y);
+            if (Boolean.TRUE.equals(Toolkit.getDefaultToolkit().getDesktopProperty("jb.swing.avoid.text.layout"))) {
+                g2d.drawString(iterator, x, y);
+            } else {
+                layout.draw(g2d, x, y);
+            }
             retVal = layout.getAdvance();
         }