stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8150176: [hidpi] wrong resolution variant of multi-res. image is used for TrayIcon

Browse Source 
Reviewed-by: serb, alexsch
This commit is contained in:
Rajeev Chamyal 2016-09-15 16:12:08 +05:30 committed by Rajeev Chamyal
parent 5e5d4783a8
commit 8ac9764ee7
3 changed files with 164 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jdk/src/java.desktop/windows/classes/sun/awt/windows/WTrayIconPeer.java
View File

@ -28,16 +28,19 @@ package sun.awt.windows;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.AWTEvent; import java.awt.AWTEvent;
import java.awt.Frame; import java.awt.Frame;
import java.awt.GraphicsEnvironment;
import java.awt.PopupMenu; import java.awt.PopupMenu;
import java.awt.Point; import java.awt.Point;
import java.awt.TrayIcon; import java.awt.TrayIcon;
import java.awt.Image; import java.awt.Image;
import java.awt.geom.AffineTransform;
import java.awt.peer.TrayIconPeer; import java.awt.peer.TrayIconPeer;
import java.awt.image.*; import java.awt.image.*;
import sun.awt.AWTAccessor; import sun.awt.AWTAccessor;
import sun.awt.SunToolkit; import sun.awt.SunToolkit;
import sun.awt.image.IntegerComponentRaster; import sun.awt.image.IntegerComponentRaster;
import sun.java2d.pipe.Region;
final class WTrayIconPeer extends WObjectPeer implements TrayIconPeer { final class WTrayIconPeer extends WObjectPeer implements TrayIconPeer {
static final int TRAY_ICON_WIDTH = 16; static final int TRAY_ICON_WIDTH = 16;
@ -123,16 +126,22 @@ final class WTrayIconPeer extends WObjectPeer implements TrayIconPeer {
return; return;
boolean autosize = ((TrayIcon)target).isImageAutoSize(); boolean autosize = ((TrayIcon)target).isImageAutoSize();
AffineTransform tx = GraphicsEnvironment.getLocalGraphicsEnvironment().
BufferedImage bufImage = new BufferedImage(TRAY_ICON_WIDTH, TRAY_ICON_HEIGHT, getDefaultScreenDevice().getDefaultConfiguration().
BufferedImage.TYPE_INT_ARGB); getDefaultTransform();
int w = Region.clipScale(TRAY_ICON_WIDTH, tx.getScaleX());
int h = Region.clipScale(TRAY_ICON_HEIGHT, tx.getScaleY());
int imgWidth = Region.clipScale(image.getWidth(observer), tx.getScaleX());
int imgHeight = Region.clipScale(image.getHeight(observer), tx.getScaleY());
BufferedImage bufImage = new BufferedImage(w,
h, BufferedImage.TYPE_INT_ARGB);
Graphics2D gr = bufImage.createGraphics(); Graphics2D gr = bufImage.createGraphics();
if (gr != null) { if (gr != null) {
try { try {
gr.setPaintMode(); gr.setPaintMode();
gr.drawImage(image, 0, 0, (autosize ? TRAY_ICON_WIDTH : image.getWidth(observer)), gr.drawImage(image, 0, 0, (autosize ? w : imgWidth),
(autosize ? TRAY_ICON_HEIGHT : image.getHeight(observer)), observer); (autosize ? h : imgHeight), observer);
createNativeImage(bufImage); createNativeImage(bufImage);

41
jdk/test/java/awt/image/multiresolution/MultiResolutionTrayIconTest/MultiResolutionTrayIconTest.html
View File

@ -1,41 +0,0 @@
<!--
Copyright (c) 2016, 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.
-->
<html>
<head>
<title> MultiResolutionTrayIconTest </title>
</head>
<body>
<applet code="MultiResolutionTrayIconTest.class" width=100 height=30></applet>
To run test please push "Start" (if system tray is not supported, push "Pass").
Two tray icons will appear (note: sometimes they can go to the tray icons pool).
Please check if both of them have correct size and
the same colouring (white rectagle in a blue mount). In this case please push "Pass".
Otherwise (if the 2nd red-white small icon appears) please push "Fail".
</body>
</html>

219
jdk/test/java/awt/image/multiresolution/MultiResolutionTrayIconTest/MultiResolutionTrayIconTest.java
View File

@ -22,96 +22,177 @@
*/ */
/* /**
@test * @test
@bug 8150176 8151773 * @key headful
@summary Check if correct resolution variant is used for tray icon. * @bug 8150176 8151773 8150176
@author a.stepanov * @summary Check if correct resolution variant is used for tray icon.
@run applet/manual=yesno MultiResolutionTrayIconTest.html * @run main/manual/othervm -Dsun.java2d.uiScale=2 MultiResolutionTrayIconTest
*/ */
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.GridBagLayout;
import java.awt.GridBagConstraints;
import java.awt.SystemTray;
import java.awt.TrayIcon;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.awt.image.BaseMultiResolutionImage;
import java.awt.image.BufferedImage;
import javax.swing.JFrame;
import javax.swing.JButton;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.SwingUtilities;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
public class MultiResolutionTrayIconTest {
private static SystemTray tray;
private static TrayIcon icon;
private static GridBagLayout layout;
private static JPanel mainControlPanel;
private static JPanel resultButtonPanel;
private static JLabel instructionText;
private static JButton passButton;
private static JButton failButton;
private static JButton startButton;
private static JFrame mainFrame;
private static CountDownLatch latch;
import java.applet.Applet; public static void main(String[] args) throws Exception {
import java.awt.*; latch = new CountDownLatch(1);
import java.awt.event.*; createUI();
import java.awt.image.*; latch.await(200, TimeUnit.SECONDS);
public class MultiResolutionTrayIconTest extends Applet {
private SystemTray tray;
private TrayIcon icon, iconMRI;
public void init() { this.setLayout(new BorderLayout()); }
public void start() {
boolean trayIsSupported = SystemTray.isSupported();
Button b = new Button("Start");
if (trayIsSupported) {
prepareIcons();
b.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) { doTest(); }
});
} else {
b.setLabel("not supported");
b.setEnabled(false);
System.out.println("system tray is not supported");
}
add(b, BorderLayout.CENTER);
validate();
setVisible(true);
} }
private BufferedImage generateImage(int w, int h, Color c) { public static void createUI() throws Exception {
SwingUtilities.invokeAndWait(new Runnable() {
public void run() {
mainFrame = new JFrame("TrayIcon Test");
boolean trayIsSupported = SystemTray.isSupported();
tray = SystemTray.getSystemTray();
Dimension d = tray.getTrayIconSize();
icon = new TrayIcon(createIcon(d.width, d.height));
icon.setImageAutoSize(true);
layout = new GridBagLayout();
mainControlPanel = new JPanel(layout);
resultButtonPanel = new JPanel(layout);
BufferedImage img = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB); GridBagConstraints gbc = new GridBagConstraints();
String instructions
= "<html>INSTRUCTIONS:<br>"
+ "Press start button to add icon to system tray.<br><br>"
+ "If Icon color is green test"
+ " passes else failed.<br><br></html>";
instructionText = new JLabel();
instructionText.setText(instructions);
gbc.gridx = 0;
gbc.gridy = 0;
gbc.fill = GridBagConstraints.HORIZONTAL;
mainControlPanel.add(instructionText, gbc);
startButton = new JButton("Start");
startButton.setActionCommand("Start");
if (trayIsSupported) {
startButton.addActionListener((ActionEvent e) -> {
doTest();
});
} else {
startButton.setEnabled(false);
System.out.println("system tray is not supported");
latch.countDown();
}
gbc.gridx = 0;
gbc.gridy = 0;
resultButtonPanel.add(startButton, gbc);
passButton = new JButton("Pass");
passButton.setActionCommand("Pass");
passButton.addActionListener((ActionEvent e) -> {
latch.countDown();
removeIcon();
mainFrame.dispose();
});
failButton = new JButton("Fail");
failButton.setActionCommand("Fail");
failButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
removeIcon();
latch.countDown();
mainFrame.dispose();
throw new RuntimeException("Test Failed");
}
});
gbc.gridx = 1;
gbc.gridy = 0;
resultButtonPanel.add(passButton, gbc);
gbc.gridx = 2;
gbc.gridy = 0;
resultButtonPanel.add(failButton, gbc);
gbc.gridx = 0;
gbc.gridy = 1;
mainControlPanel.add(resultButtonPanel, gbc);
mainFrame.add(mainControlPanel);
mainFrame.setSize(400, 200);
mainFrame.setLocationRelativeTo(null);
mainFrame.setVisible(true);
mainFrame.addWindowListener(new WindowAdapter() {
@Override
public void windowClosing(WindowEvent e) {
removeIcon();
latch.countDown();
mainFrame.dispose();
}
});
}
});
}
private static BaseMultiResolutionImage createIcon(int w, int h) {
return new BaseMultiResolutionImage(
new BufferedImage[]{generateImage(w, h, 1, Color.RED),
generateImage(w, h, 2, Color.GREEN)});
}
private static BufferedImage generateImage(int w, int h, int scale, Color c) {
int x = w * scale, y = h * scale;
BufferedImage img = new BufferedImage(x, y, BufferedImage.TYPE_INT_RGB);
Graphics g = img.getGraphics(); Graphics g = img.getGraphics();
g.setColor(c); g.setColor(c);
g.fillRect(0, 0, w, h); g.fillRect(0, 0, x, y);
g.setColor(Color.WHITE); g.setColor(Color.WHITE);
int r = (Math.min(w, h) >= 8) ? 3 : 1; g.fillRect(x / 3, y / 3, x / 3, y / 3);
g.fillRect(r, r, w - 2 * r, h - 2 * r);
return img; return img;
} }
private void prepareIcons() { private static void doTest() {
tray = SystemTray.getSystemTray(); if (tray.getTrayIcons().length > 0) {
Dimension d = tray.getTrayIconSize(); return;
int w = d.width, h = d.height; }
BufferedImage img = generateImage(w, h, Color.BLUE);
// use wrong icon size for "nok"
BufferedImage nok = generateImage(w / 2 + 2, h / 2 + 2, Color.RED);
BaseMultiResolutionImage mri =
new BaseMultiResolutionImage(new BufferedImage[] {nok, img});
icon = new TrayIcon(img);
icon.setImageAutoSize(true); // just in case
iconMRI = new TrayIcon(mri);
iconMRI.setImageAutoSize(true);
}
private void doTest() {
if (tray.getTrayIcons().length > 0) { return; } // icons were added already
try { try {
tray.add(icon); tray.add(icon);
tray.add(iconMRI);
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
public void stop() { private static void removeIcon() {
// check for null, just in case
if (tray != null) { if (tray != null) {
tray.remove(icon); tray.remove(icon);
tray.remove(iconMRI);
} }
} }
} }