提交 afcf81f5 编写于 作者: S ssadetsky

8132136: [PIT] RTL orientation in JEditorPane is broken

Summary: Reverse 8076164, check for can't resize up front in GlyphView.getMinimumSpan.
Reviewed-by: alexsch, serb
上级 1f4510f0
...@@ -96,12 +96,7 @@ public class BasicTextFieldUI extends BasicTextUI { ...@@ -96,12 +96,7 @@ public class BasicTextFieldUI extends BasicTextUI {
String kind = elem.getName(); String kind = elem.getName();
if (kind != null) { if (kind != null) {
if (kind.equals(AbstractDocument.ContentElementName)) { 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)) { } else if (kind.equals(AbstractDocument.ParagraphElementName)) {
return new I18nFieldView(elem); return new I18nFieldView(elem);
} }
......
...@@ -528,17 +528,6 @@ public class GlyphView extends View implements TabableView, Cloneable { ...@@ -528,17 +528,6 @@ 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. * Determines the minimum span for this view along an axis.
* *
...@@ -552,11 +541,13 @@ public class GlyphView extends View implements TabableView, Cloneable { ...@@ -552,11 +541,13 @@ public class GlyphView extends View implements TabableView, Cloneable {
*/ */
@Override @Override
public float getMinimumSpan(int axis) { public float getMinimumSpan(int axis) {
int w = getResizeWeight(axis);
if (w == 0) {
// can't resize
return getPreferredSpan(axis);
}
switch (axis) { switch (axis) {
case View.X_AXIS: case View.X_AXIS:
if (getResizeWeight(X_AXIS) == 0) {
return getPreferredSpan(X_AXIS);
}
if (minimumSpan < 0) { if (minimumSpan < 0) {
minimumSpan = 0; minimumSpan = 0;
int p0 = getStartOffset(); int p0 = getStartOffset();
......
/*
* 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 8132136
@summary [PIT] RTL orientation in JEditorPane is broken
@author Semyon Sadetsky
*/
import javax.swing.*;
import javax.swing.text.BadLocationException;
import javax.swing.text.SimpleAttributeSet;
import javax.swing.text.StyleConstants;
import java.awt.*;
public class JTextPaneDocumentAlignment {
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(
"<html><body><b id='test'>Test</b></body></html>");
SimpleAttributeSet right = new SimpleAttributeSet();
StyleConstants.setAlignment(right, StyleConstants.ALIGN_RIGHT);
jTextPane.getStyledDocument()
.setParagraphAttributes(0, 10, right, true);
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(1).x;
SimpleAttributeSet center = new SimpleAttributeSet();
StyleConstants.setAlignment(center,
StyleConstants.ALIGN_CENTER);
jTextPane.getStyledDocument()
.setParagraphAttributes(0, 10, center, true);
} catch (BadLocationException e) {
e.printStackTrace();
}
}
});
if(position < 100) {
throw new RuntimeException("Text is not right aligned " + position);
}
SwingUtilities.invokeAndWait(new Runnable() {
@Override
public void run() {
try {
position = jTextPane.modelToView(1).x;
} catch (BadLocationException e) {
e.printStackTrace();
}
frame.dispose();
}
});
if(position < 20) {
throw new RuntimeException("Text is not center aligned " + position);
}
System.out.println("ok");
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册