From 547bc1cdeb86e65caa3913a07b777cd1ac3e0a8e Mon Sep 17 00:00:00 2001 From: alexsch Date: Thu, 10 Apr 2014 14:59:56 +0400 Subject: [PATCH] 8038113: [macosx] JTree icon is not rendered in high resolution on Retina Reviewed-by: serb, pchelko --- .../classes/com/apple/laf/AquaIcon.java | 74 +++++++++-------- .../com/apple/laf/AquaInternalFrameUI.java | 3 +- .../javax/swing/JTree/8038113/bug8038113.html | 36 ++++++++ .../javax/swing/JTree/8038113/bug8038113.java | 82 +++++++++++++++++++ 4 files changed, 159 insertions(+), 36 deletions(-) create mode 100644 test/javax/swing/JTree/8038113/bug8038113.html create mode 100644 test/javax/swing/JTree/8038113/bug8038113.java diff --git a/src/macosx/classes/com/apple/laf/AquaIcon.java b/src/macosx/classes/com/apple/laf/AquaIcon.java index e40d066ac..4af5599b6 100644 --- a/src/macosx/classes/com/apple/laf/AquaIcon.java +++ b/src/macosx/classes/com/apple/laf/AquaIcon.java @@ -44,7 +44,8 @@ public class AquaIcon { } static UIResource getIconFor(final JRSUIControlSpec spec, final int width, final int height) { - return new CachableJRSUIIcon(width, height) { + return new ScalingJRSUIIcon(width, height) { + @Override public void initIconPainter(final AquaPainter painter) { spec.initIconPainter(painter); } @@ -128,35 +129,12 @@ public class AquaIcon { if (image != null) return image; if (!GraphicsEnvironment.isHeadless()) { - image = getOptimizedImage(); + image = createImage(); } return image; } - private Image getOptimizedImage() { - final Image img = createImage(); - // TODO: no RuntimeOptions for now - //if (RuntimeOptions.getRenderer(null) != RuntimeOptions.Sun) return img; - return getProgressiveOptimizedImage(img, getIconWidth(), getIconHeight()); - } - - static Image getProgressiveOptimizedImage(final Image img, final int w, final int h) { - if (img == null) return null; - - final int halfImgW = img.getWidth(null) / 2; - final int halfImgH = img.getHeight(null) / 2; - if (w * 2 > halfImgW && h * 2 > halfImgH) return img; - - final BufferedImage halfImage = new BufferedImage(halfImgW, halfImgH, BufferedImage.TYPE_INT_ARGB); - final Graphics g = halfImage.getGraphics(); - ((Graphics2D)g).setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR); - g.drawImage(img, 0, 0, halfImgW, halfImgH, null); - g.dispose(); - - return getProgressiveOptimizedImage(halfImage, w, h); - } - abstract Image createImage(); public boolean hasIconRef() { @@ -189,24 +167,50 @@ public class AquaIcon { } - static abstract class CachableJRSUIIcon extends CachingScalingIcon implements UIResource { - public CachableJRSUIIcon(final int width, final int height) { - super(width, height); + static abstract class ScalingJRSUIIcon implements Icon, UIResource { + final int width; + final int height; + + public ScalingJRSUIIcon(final int width, final int height) { + this.width = width; + this.height = height; } - Image createImage() { - final AquaPainter painter = AquaPainter.create(JRSUIState.getInstance()); + @Override + public void paintIcon(final Component c, Graphics g, + final int x, final int y) { + if (GraphicsEnvironment.isHeadless()) { + return; + } + + g = g.create(); + + if (g instanceof Graphics2D) { + // improves icon rendering quality in Quartz + ((Graphics2D) g).setRenderingHint(RenderingHints.KEY_RENDERING, + RenderingHints.VALUE_RENDER_QUALITY); + } + + final AquaPainter painter = + AquaPainter.create(JRSUIState.getInstance()); initIconPainter(painter); - final BufferedImage img = new BufferedImage(getIconWidth(), getIconHeight(), BufferedImage.TYPE_INT_ARGB_PRE); - final Graphics g = img.getGraphics(); - g.setClip(new Rectangle(0, 0, getIconWidth(), getIconHeight())); - painter.paint(g, null, 0, 0, getIconWidth(), getIconHeight()); + g.setClip(new Rectangle(x, y, width, height)); + painter.paint(g, c, x, y, width, height); g.dispose(); - return img; } public abstract void initIconPainter(final AquaPainter painter); + + @Override + public int getIconWidth() { + return width; + } + + @Override + public int getIconHeight() { + return height; + } } static class FileIcon extends CachingScalingIcon { diff --git a/src/macosx/classes/com/apple/laf/AquaInternalFrameUI.java b/src/macosx/classes/com/apple/laf/AquaInternalFrameUI.java index dd0267ce3..5dbefe389 100644 --- a/src/macosx/classes/com/apple/laf/AquaInternalFrameUI.java +++ b/src/macosx/classes/com/apple/laf/AquaInternalFrameUI.java @@ -786,8 +786,9 @@ public class AquaInternalFrameUI extends BasicInternalFrameUI implements SwingCo } static final RecyclableSingleton RESIZE_ICON = new RecyclableSingleton() { + @Override protected Icon getInstance() { - return new AquaIcon.CachableJRSUIIcon(11, 11) { + return new AquaIcon.ScalingJRSUIIcon(11, 11) { public void initIconPainter(final AquaPainter iconState) { iconState.state.set(Widget.GROW_BOX_TEXTURED); iconState.state.set(WindowType.UTILITY); diff --git a/test/javax/swing/JTree/8038113/bug8038113.html b/test/javax/swing/JTree/8038113/bug8038113.html new file mode 100644 index 000000000..1eb5480b5 --- /dev/null +++ b/test/javax/swing/JTree/8038113/bug8038113.html @@ -0,0 +1,36 @@ + + + + + +Verify that scaled icons are rendered smoothly. + +1. Run the test. +2. Check that Collapsed and Expanded JTree icons are drawn smoothly. +If so, press PASS, else press FAIL. + + + + + diff --git a/test/javax/swing/JTree/8038113/bug8038113.java b/test/javax/swing/JTree/8038113/bug8038113.java new file mode 100644 index 000000000..fb094c4a2 --- /dev/null +++ b/test/javax/swing/JTree/8038113/bug8038113.java @@ -0,0 +1,82 @@ +/* + * Copyright (c) 2014, 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. + */ +import java.awt.BasicStroke; +import java.awt.BorderLayout; +import java.awt.Graphics; +import java.awt.Graphics2D; +import javax.swing.Icon; +import javax.swing.JApplet; +import javax.swing.JPanel; +import javax.swing.JTree; +import javax.swing.SwingUtilities; +import javax.swing.plaf.basic.BasicTreeUI; + +/* @test + * @bug 8038113 + * @summary [macosx] JTree icon is not rendered in high resolution on Retina + * @run applet/manual=yesno bug8038113.html + */ +public class bug8038113 extends JApplet { + + @Override + public void init() { + SwingUtilities.invokeLater(new Runnable() { + + @Override + public void run() { + + final JTree tree = new JTree(); + final BasicTreeUI treeUI = (BasicTreeUI) tree.getUI(); + + final JPanel panel = new JPanel() { + + @Override + public void paint(Graphics g) { + super.paint(g); + Graphics2D g2 = (Graphics2D) g; + g2.setStroke(new BasicStroke(0.5f)); + g2.scale(2, 2); + + int x = 10; + int y = 10; + Icon collapsedIcon = treeUI.getCollapsedIcon(); + Icon expandeIcon = treeUI.getExpandedIcon(); + int w = collapsedIcon.getIconWidth(); + int h = collapsedIcon.getIconHeight(); + collapsedIcon.paintIcon(this, g, x, y); + g.drawRect(x, y, w, h); + + y += 10 + h; + w = expandeIcon.getIconWidth(); + h = expandeIcon.getIconHeight(); + expandeIcon.paintIcon(this, g, x, y); + g.drawRect(x, y, w, h); + + } + }; + getContentPane().setLayout(new BorderLayout()); + getContentPane().add(panel, BorderLayout.CENTER); + } + }); + } +} -- GitLab