From 1a80de80661231df411ce108f561eb37a93f81f3 Mon Sep 17 00:00:00 2001 From: ssadetsky Date: Fri, 8 Mar 2019 16:16:40 +0000 Subject: [PATCH] 8133108: [PIT] Container size is wrong in JEditorPane Summary: Override GlyphView.getMinimumSpan in BasicTextFieldUI instead of explicit check in default getMinimumSpan. Reviewed-by: alexsch, azvegint --- .../swing/plaf/basic/BasicTextFieldUI.java | 8 +- .../classes/javax/swing/text/GlyphView.java | 5 - .../JTextPane/JTextPaneDocumentWrapping.java | 101 ++++++++++++++++++ 3 files changed, 108 insertions(+), 6 deletions(-) create mode 100644 test/javax/swing/JTextPane/JTextPaneDocumentWrapping.java diff --git a/src/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java b/src/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java index 16edc3eb8..5567042e8 100644 --- a/src/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java +++ b/src/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java @@ -96,7 +96,13 @@ 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 float getMinimumSpan(int axis) { + // no wrap + return getPreferredSpan(axis); + } + }; } 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 8413b21a3..22fb65a83 100644 --- a/src/share/classes/javax/swing/text/GlyphView.java +++ b/src/share/classes/javax/swing/text/GlyphView.java @@ -541,11 +541,6 @@ public class GlyphView extends View implements TabableView, Cloneable { */ @Override public float getMinimumSpan(int axis) { - int w = getResizeWeight(axis); - if (w == 0) { - // can't resize - return getPreferredSpan(axis); - } switch (axis) { case View.X_AXIS: if (minimumSpan < 0) { diff --git a/test/javax/swing/JTextPane/JTextPaneDocumentWrapping.java b/test/javax/swing/JTextPane/JTextPaneDocumentWrapping.java new file mode 100644 index 000000000..ba7aee423 --- /dev/null +++ b/test/javax/swing/JTextPane/JTextPaneDocumentWrapping.java @@ -0,0 +1,101 @@ +/* + * 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 8133108 + @summary [PIT] Container size is wrong in JEditorPane + @author Semyon Sadetsky + */ + +import javax.swing.*; +import javax.swing.text.BadLocationException; +import javax.swing.text.SimpleAttributeSet; +import javax.swing.text.html.CSS; +import java.awt.*; + +public class JTextPaneDocumentWrapping { + + private static JFrame frame; + private static JTextPane jTextPane; + private static int position; + + public static void main(String[] args) throws Exception{ + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + frame = new JFrame(); + frame.setUndecorated(true); + frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); + frame.setSize(200, 200); + jTextPane = new JTextPane(); + jTextPane.setContentType("text/html"); + jTextPane.setText( + "Test Test Test Test Test Test " + + "Test Test Test Test Test Test Test Test Test Test " + + "Test Test Test Test Test Test Test Test Test Test" + + ""); + frame.getContentPane().add(jTextPane); + frame.setVisible(true); + } + }); + Robot robot = new Robot(); + robot.waitForIdle(); + robot.delay(200); + + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + try { + position = jTextPane.modelToView(100).y; + SimpleAttributeSet wrap = new SimpleAttributeSet(); + wrap.addAttribute(CSS.Attribute.WHITE_SPACE, "nowrap"); + jTextPane.getStyledDocument() + .setParagraphAttributes(0, 10, wrap, true); + } catch (BadLocationException e) { + e.printStackTrace(); + } + } + }); + if(position < 40) { + throw new RuntimeException("Text is not wrapped " + position); + } + robot.waitForIdle(); + robot.delay(200); + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + try { + position = jTextPane.modelToView(100).y; + } catch (BadLocationException e) { + e.printStackTrace(); + } + frame.dispose(); + } + }); + if(position > 20) { + throw new RuntimeException("Text is wrapped " + position); + } + System.out.println("ok"); + + } +} -- GitLab