8262085: Hovering Metal HTML Tooltips in different windows cause IllegalArgExc on Linux
Reviewed-by: serb, psadhukhan
This commit is contained in:
parent
75bf10610f
commit
c569f1d64b
src/java.desktop/share/classes/javax/swing/plaf/metal
test/jdk/javax/swing/JToolTip
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1998, 2021, 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
|
||||
@ -29,8 +29,6 @@ import sun.swing.SwingUtilities2;
|
||||
import java.awt.*;
|
||||
import java.awt.event.*;
|
||||
import javax.swing.*;
|
||||
import javax.swing.BorderFactory;
|
||||
import javax.swing.border.Border;
|
||||
import javax.swing.plaf.*;
|
||||
import javax.swing.plaf.basic.BasicToolTipUI;
|
||||
import javax.swing.plaf.basic.BasicHTML;
|
||||
@ -120,6 +118,11 @@ public class MetalToolTipUI extends BasicToolTipUI {
|
||||
insets.top,
|
||||
size.width - (insets.left + insets.right) - 6 - accelSpacing,
|
||||
size.height - (insets.top + insets.bottom));
|
||||
|
||||
if (paintTextR.width <= 0 || paintTextR.height <= 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
View v = (View) c.getClientProperty(BasicHTML.propertyKey);
|
||||
if (v != null) {
|
||||
v.paint(g, paintTextR);
|
||||
|
81
test/jdk/javax/swing/JToolTip/FastTooltipSwitchIAE.java
Normal file
81
test/jdk/javax/swing/JToolTip/FastTooltipSwitchIAE.java
Normal file
@ -0,0 +1,81 @@
|
||||
/*
|
||||
* Copyright (c) 2021, 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
|
||||
* @key headful
|
||||
* @bug 8262085
|
||||
* @summary Tests tooltip for not throwing IllegalArgumentException on fast switching between frames.
|
||||
* @run main FastTooltipSwitchIAE
|
||||
*/
|
||||
|
||||
import javax.swing.JToolTip;
|
||||
import javax.swing.SwingUtilities;
|
||||
import javax.swing.UIManager;
|
||||
import javax.swing.UnsupportedLookAndFeelException;
|
||||
import java.awt.Dimension;
|
||||
import java.awt.Graphics2D;
|
||||
import java.awt.image.BufferedImage;
|
||||
|
||||
public class FastTooltipSwitchIAE {
|
||||
static Dimension oneByOneSize = new Dimension(1, 1);
|
||||
|
||||
public static void main(String[] args) {
|
||||
for (UIManager.LookAndFeelInfo laf : UIManager.getInstalledLookAndFeels()) {
|
||||
try {
|
||||
SwingUtilities.invokeAndWait(() -> setLookAndFeel(laf));
|
||||
SwingUtilities.invokeAndWait(FastTooltipSwitchIAE::doTest);
|
||||
System.out.println("Test passed for LookAndFeel " + laf.getClassName());
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException("Test failed for " + laf.getClassName(), e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static void setLookAndFeel(final UIManager.LookAndFeelInfo laf) {
|
||||
try {
|
||||
System.out.println("LookAndFeel: " + laf.getClassName());
|
||||
UIManager.setLookAndFeel(laf.getClassName());
|
||||
} catch (UnsupportedLookAndFeelException ignored) {
|
||||
System.err.println("Unsupported L&F: " + laf.getClassName());
|
||||
} catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
private static void doTest() {
|
||||
JToolTip toolTip = new JToolTip();
|
||||
toolTip.setTipText("<html><h1>Hello world</h1></html>");
|
||||
toolTip.setMinimumSize(oneByOneSize);
|
||||
toolTip.setMaximumSize(oneByOneSize);
|
||||
toolTip.setPreferredSize(oneByOneSize);
|
||||
toolTip.setBounds(100, 100, 1, 1);
|
||||
|
||||
BufferedImage img = new BufferedImage(100, 100, BufferedImage.TYPE_INT_ARGB);
|
||||
Graphics2D g2d = img.createGraphics();
|
||||
|
||||
toolTip.paint(g2d);
|
||||
|
||||
g2d.dispose();
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user