From 1f4510f0df99e2c4726fa827b399ed71e5442268 Mon Sep 17 00:00:00 2001
From: ssadetsky <unknown>
Date: Wed, 6 Mar 2019 21:43:04 +0000
Subject: [PATCH] 8076164: [JTextField] When input too long Thai character,
 cursor's behavior is odd Summary: Add GlyphView.getResizeWeight() to enable
 forced use of getPreferredSpan(X_AXIS). Reviewed-by: alexsch, azvegint

---
 .../swing/plaf/basic/BasicTextFieldUI.java    |  9 ++-
 .../classes/javax/swing/text/GlyphView.java   | 16 ++++-
 .../I18NViewNoWrapMinSpan.java                | 61 +++++++++++++++++++
 3 files changed, 83 insertions(+), 3 deletions(-)
 create mode 100644 test/javax/swing/JTextField/I18NViewNoWrapMinSpan/I18NViewNoWrapMinSpan.java

diff --git a/src/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java b/src/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java
index a84da5fde..fd3948fac 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -96,7 +96,12 @@ public class BasicTextFieldUI extends BasicTextUI {
             String kind = elem.getName();
             if (kind != null) {
                 if (kind.equals(AbstractDocument.ContentElementName)) {
-                    return new GlyphView(elem);
+                    return new GlyphView(elem) {
+                        @Override
+                        public int getResizeWeight(int axis) {
+                            return 0;
+                        }
+                    };
                 } else if (kind.equals(AbstractDocument.ParagraphElementName)) {
                     return new I18nFieldView(elem);
                 }
diff --git a/src/share/classes/javax/swing/text/GlyphView.java b/src/share/classes/javax/swing/text/GlyphView.java
index fd75fa096..f191f3413 100644
--- a/src/share/classes/javax/swing/text/GlyphView.java
+++ b/src/share/classes/javax/swing/text/GlyphView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -528,6 +528,17 @@ public class GlyphView extends View implements TabableView, Cloneable {
         }
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int getResizeWeight(int axis) {
+        if (axis == View.X_AXIS) {
+            return 1;
+        }
+        return 0;
+    }
+
     /**
      * Determines the minimum span for this view along an axis.
      *
@@ -543,6 +554,9 @@ public class GlyphView extends View implements TabableView, Cloneable {
     public float getMinimumSpan(int axis) {
         switch (axis) {
             case View.X_AXIS:
+                if (getResizeWeight(X_AXIS) == 0) {
+                    return getPreferredSpan(X_AXIS);
+                }
                 if (minimumSpan < 0) {
                     minimumSpan = 0;
                     int p0 = getStartOffset();
diff --git a/test/javax/swing/JTextField/I18NViewNoWrapMinSpan/I18NViewNoWrapMinSpan.java b/test/javax/swing/JTextField/I18NViewNoWrapMinSpan/I18NViewNoWrapMinSpan.java
new file mode 100644
index 000000000..fae1052a1
--- /dev/null
+++ b/test/javax/swing/JTextField/I18NViewNoWrapMinSpan/I18NViewNoWrapMinSpan.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+   @bug 8076164
+   @summary [JTextField] When input too long Thai character, cursor's behavior
+            is odd
+   @author Semyon Sadetsky
+*/
+
+import javax.swing.*;
+import javax.swing.SwingUtilities;
+import javax.swing.text.BadLocationException;
+import java.lang.Override;
+import java.lang.Runnable;
+
+public class I18NViewNoWrapMinSpan {
+
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    JTextField textField = new JTextField(15);
+                    textField.setText("ม12345");
+                    float noSpaceMin = textField.getUI().getRootView(textField)
+                            .getMinimumSpan(0);
+                    textField.getDocument().insertString(3, " ", null);
+                    if (noSpaceMin > textField.getUI().getRootView(textField)
+                            .getMinimumSpan(0)) {
+                        throw new RuntimeException(
+                                "Minimum span is calculated for wrapped text");
+                    }
+                } catch (BadLocationException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        });
+        System.out.println("ok");
+    }
+}
-- 
GitLab