From 89d84f40c68f064938f25558f30aa331bb5b5788 Mon Sep 17 00:00:00 2001 From: rpatil Date: Tue, 1 May 2018 23:16:23 -0700 Subject: [PATCH] 8195095: Images are not scaled correctly in JEditorPane Reviewed-by: ssadetsky, psadhukhan, mhalder --- .../javax/swing/text/html/ImageView.java | 8 +- .../JEditorPane/8195095/ImageViewTest.java | 142 ++++++++++++++++++ .../swing/JEditorPane/8195095/circle.png | Bin 0 -> 1376 bytes 3 files changed, 146 insertions(+), 4 deletions(-) create mode 100644 test/javax/swing/JEditorPane/8195095/ImageViewTest.java create mode 100644 test/javax/swing/JEditorPane/8195095/circle.png diff --git a/src/share/classes/javax/swing/text/html/ImageView.java b/src/share/classes/javax/swing/text/html/ImageView.java index bf01379f1..709379f3d 100644 --- a/src/share/classes/javax/swing/text/html/ImageView.java +++ b/src/share/classes/javax/swing/text/html/ImageView.java @@ -910,12 +910,12 @@ public class ImageView extends View { } synchronized(ImageView.this) { - if ((changed & 1) == 1 && (state & WIDTH_FLAG) == 0) { - width = newWidth; - } - if ((changed & 2) == 2 && (state & HEIGHT_FLAG) == 0) { + if ((changed & 1) == 1 && (state & HEIGHT_FLAG) == 0) { height = newHeight; } + if ((changed & 2) == 2 && (state & WIDTH_FLAG) == 0) { + width = newWidth; + } if ((state & LOADING_FLAG) == LOADING_FLAG) { // No need to resize or repaint, still in the process of // loading. diff --git a/test/javax/swing/JEditorPane/8195095/ImageViewTest.java b/test/javax/swing/JEditorPane/8195095/ImageViewTest.java new file mode 100644 index 000000000..40f1fd580 --- /dev/null +++ b/test/javax/swing/JEditorPane/8195095/ImageViewTest.java @@ -0,0 +1,142 @@ +/* + * Copyright (c) 2018, 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 8195095 + * @summary Tests if Images are scaled correctly in JEditorPane. + * @run main ImageViewTest + */ +import java.awt.Robot; +import java.awt.Point; +import java.awt.Color; +import java.awt.Insets; + +import javax.swing.JEditorPane; +import javax.swing.SwingUtilities; +import javax.swing.JFrame; +import javax.swing.WindowConstants; + +public class ImageViewTest { + + private static final int WIDTH = 200; + private static final int HEIGHT = 200; + private static JFrame f; + + private static JEditorPane editorPane1; + private static JEditorPane editorPane2; + private static JEditorPane editorPane3; + private static JEditorPane editorPane4; + + private static void test(Robot r, JEditorPane editorPane) throws Exception { + + SwingUtilities.invokeAndWait(() -> { + f = new JFrame(); + editorPane.setEditable(false); + f.add(editorPane); + f.setSize(220,240); + f.setLocationRelativeTo(null); + + f.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); + f.setVisible(true); + }); + + r.waitForIdle(); + r.delay(500); + + SwingUtilities.invokeAndWait(() -> { + Insets insets = editorPane.getInsets(); + Point loc = editorPane.getLocationOnScreen(); + + final Color blue = Color.BLUE; + final int offset = 10; + + Color center = r.getPixelColor(loc.x + insets.left + WIDTH / 2, + loc.y + insets.top + HEIGHT / 2); + Color left = r.getPixelColor(loc.x + insets.left + offset, + loc.y + insets.top + HEIGHT / 2); + Color right = r.getPixelColor(loc.x + insets.left + WIDTH - offset, + loc.y + insets.top + HEIGHT / 2); + Color bottom = r.getPixelColor(loc.x + insets.left + WIDTH / 2, + loc.y + insets.top + HEIGHT - offset); + Color top = r.getPixelColor(loc.x + insets.left + WIDTH / 2, + loc.y + insets.top + offset); + + f.dispose(); + + System.out.println("center color: " + center); + System.out.println("left color: " + left); + System.out.println("right color: " + right); + System.out.println("bottom color: " + bottom); + System.out.println("top color: " + top); + System.out.println(); + + if (!(blue.equals(center) && blue.equals(left) && blue.equals(right) && + blue.equals(top) && blue.equals(bottom))) { + throw new RuntimeException("Test failed: Image not scaled correctly"); + } + }); + + r.waitForIdle(); + } + + public static void main(String[] args) throws Exception { + + final String ABSOLUTE_FILE_PATH = ImageViewTest.class.getResource("circle.png").getPath(); + + System.out.println(ABSOLUTE_FILE_PATH); + + Robot r = new Robot(); + + SwingUtilities.invokeAndWait(() -> { + editorPane1 = new JEditorPane("text/html", + "|MOQro#r$x zbQi-Z=9wF=d;iW&O8C8?ud{OR{rCC@q!RyrtkShldB|bkD;*Z;9O=fFH)VrXN=f#L zb5(q&oqf`G^{?5!!RC0$vePH5IJJ}f=T~Xz)I`*(Y`y9p7kK#9`sMx$xx2-$ad_sk zp4Ik=Sp4;iW>_NQA*GdTH7a-VbuT&h*o7M?CIJa93OYA#)OzVAer#lo2FnY9R3AEGrUKT>c?f8PzyI&J5v0pQ0Av`@bfAijKle)rA-E6?V6%}`;Se_b=bynLh|qoH`yXEZ z8%Y}zGVf}_EC-tPgR^_T1l(DjsycDbAVtaBeZfvRk{?l%w(v%}4a5)ihaQ=_G#<_Y z1_jWa-x5DcDV>fqfXK0fco$u@fV{rLNm~kDTM0ozH3}N4t2apK%6M@$A8k6~8_^?H zCNw!=qe7v)*kVw$cy_x+pEw%a5fb@(l9bqD(;ashfR?1R9L?Ze{ovJSvF>dXI+hEV zpSq@Et>c!harAoZrid-39qQs|gE=}6ZID>|&UVkEPe&K6?X%r~$K78sxAf$bsGrB0 zj$8)Hor{QFaWLs(7$})N(_FHa??&9Bo91G0+4*TbiT8{KrGHdMAXR znH}lEn|(Dk@!?msr9)jqj;G*rimGh1}yhJASn7o#Jh=PAGbens52ed|-jO@@9| yhF%fYrB>3PGQ^wPN?&;9&UwU_==k9EYx&bJ17(yZo)iF