Skip to content

Commit

Permalink
8187759: Background not refreshed when painting over a transparent JF…
Browse files Browse the repository at this point in the history
…rame

Reviewed-by: azvegint, abhiscxk, serb
  • Loading branch information
Tejesh R committed Feb 21, 2024
1 parent d5f3d5c commit 04d43c4
Show file tree
Hide file tree
Showing 2 changed files with 219 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,15 @@ public boolean paint(JComponent paintingComponent,
((SunGraphics2D)bsg).constrain(xOffset + cx, yOffset + cy,
x + w, y + h);
bsg.setClip(x, y, w, h);

if (!bufferComponent.isOpaque()) {
final SunGraphics2D g2d = (SunGraphics2D) bsg;
final Color oldBg = g2d.getBackground();
g2d.setBackground(paintingComponent.getBackground());
g2d.clearRect(x, y, w, h);
g2d.setBackground(oldBg);
}

paintingComponent.paintToOffscreen(bsg, x, y, w, h,
x + w, y + h);
accumulate(xOffset + x, yOffset + y, w, h);
Expand Down
210 changes: 210 additions & 0 deletions test/jdk/javax/swing/JFrame/JFrameBackgroundRefreshTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,210 @@
/*
* Copyright (c) 2023, 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.Color;
import java.awt.Component;
import java.awt.Font;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.MouseInfo;
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.Robot;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import javax.imageio.ImageIO;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.SwingUtilities;

/*
* @test
* @key headful
* @bug 8187759
* @summary Test to check if JFrame background is refreshed in Linux.
* @requires (os.family == "linux")
* @run main JFrameBackgroundRefreshTest
*/

public class JFrameBackgroundRefreshTest {
public static JFrame frame;
private static final BufferedImage test = generateImage();
private static Point p = new Point();
private static Robot robot;
private static JFrame whiteFrame;
private static Point frameLocation;
private static int frameCenterX, frameCenterY, awayX, awayY;
private static int imageCenterX, imageCenterY;

public static void main(String[] args) throws Exception {
try {
SwingUtilities.invokeAndWait(() -> {
try {
JFrameBackgroundRefreshTest.initialize();
} catch (Exception e) {
throw new RuntimeException(e);
}
});

SwingUtilities.invokeAndWait(() -> {
frameLocation = whiteFrame.getLocationOnScreen();
frameCenterX = frameLocation.x + whiteFrame.getWidth() / 2;
frameCenterY = frameLocation.y + whiteFrame.getHeight() / 2;
awayX = frameLocation.x + whiteFrame.getWidth() + 100;
awayY = frameLocation.y + whiteFrame.getHeight() / 2;
imageCenterX = p.x + test.getWidth() / 2;
imageCenterY = p.y + test.getHeight() / 2;
});
robot.delay(100);
robot.waitForIdle();
robot.mouseMove(imageCenterX, imageCenterY);
robot.delay(100);
robot.waitForIdle();
moveMouseSlowly(frameCenterX, frameCenterY);
robot.delay(1000);
robot.waitForIdle();

moveMouseSlowly(awayX, awayY);
robot.delay(100);
robot.waitForIdle();
Rectangle screenCaptureRect = new Rectangle(frameCenterX - 50,
frameCenterY - 50, 100, 100);
BufferedImage bufferedImage = robot.createScreenCapture(screenCaptureRect);

if (!compareImages(bufferedImage)) {
try {
ImageIO.write(bufferedImage, "png",
new File("FailureImage.png"));
} catch (IOException e) {
e.printStackTrace();
}
throw new RuntimeException("Test Failed!");
}
System.out.println("Test Passed!");
} finally {
SwingUtilities.invokeAndWait(() -> {
if (frame != null) {
frame.dispose();
}
if (whiteFrame != null) {
whiteFrame.dispose();
}
});
}
}

private static void moveMouseSlowly( int targetX, int targetY) {
Point currentMousePos = MouseInfo.getPointerInfo().getLocation();
int currentX = currentMousePos.x;
int currentY = currentMousePos.y;
int deltaX = targetX - currentX;
int deltaY = targetY - currentY;
int steps = 50;
double stepX = (double) deltaX / steps;
double stepY = (double) deltaY / steps;
for (int i = 1; i <= steps; i++) {
int nextX = currentX + (int) Math.round(i * stepX);
int nextY = currentY + (int) Math.round(i * stepY);
robot.mouseMove(nextX, nextY);
robot.delay(10);
}
robot.mouseMove(targetX, targetY);
}

private static boolean compareImages(BufferedImage bufferedImage) {
int sampleRGB = bufferedImage.getRGB(0,0);
for (int x = 0; x < bufferedImage.getWidth(); x++) {
for (int y = 0; y < bufferedImage.getHeight(); y++) {
if (bufferedImage.getRGB(x, y) != sampleRGB) {
return false;
}
}
}
return true;
}

public static void initialize() throws Exception {
frame = new JFrame("JFrame Background refresh test");
whiteFrame = new JFrame("White Frame");
robot = new Robot();
whiteFrame.setSize(200, 200);
whiteFrame.setBackground(Color.WHITE);
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
frame.setUndecorated(true);
frame.setExtendedState(JFrame.MAXIMIZED_BOTH);
frame.setBackground(new Color(0, 0, 0, 0));
frame.setContentPane(new TranslucentPane());
frame.addMouseMotionListener(new MouseDragListener());
whiteFrame.setLocationRelativeTo(null);
whiteFrame.setVisible(true);
frame.setVisible(true);
frame.setAlwaysOnTop(true);
}
private static class MouseDragListener extends MouseAdapter {
@Override
public void mouseMoved(MouseEvent e) {
p = e.getPoint();
frame.repaint();
}
}

/** Capture an image of any component **/
private static BufferedImage getImage(Component c) {
if (c == null) {
return null;
}
BufferedImage image = new BufferedImage(c.getWidth(),
c.getHeight(), BufferedImage.TYPE_INT_ARGB);
Graphics2D g = image.createGraphics();
c.printAll(g);
g.dispose();
return image;
}

/** Generates a dummy image to be painted on the frame **/
private static BufferedImage generateImage() {
JLabel label = new JLabel("test");
label.setFont(new Font("Arial", Font.BOLD, 24));
label.setSize(label.getPreferredSize());
return getImage(label);
}

public static class TranslucentPane extends JPanel {
public TranslucentPane() {
setOpaque(false);
}
@Override
protected void paintComponent(Graphics g) {
super.paintComponent(g);
Graphics2D g2d = (Graphics2D) g.create();
g2d.setColor(new Color(0,0,0,0));
g2d.fillRect(0, 0, getWidth(), getHeight());
g2d.drawImage(test, p.x, p.y, this);
g2d.dispose();
}
}
}

3 comments on commit 04d43c4

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Renjithkannath
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk22u

@openjdk
Copy link

@openjdk openjdk bot commented on 04d43c4 Feb 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Renjithkannath the backport was successfully created on the branch backport-Renjithkannath-04d43c43 in my personal fork of openjdk/jdk22u. To create a pull request with this backport targeting openjdk/jdk22u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 04d43c43 from the openjdk/jdk repository.

The commit being backported was authored by Tejesh R on 21 Feb 2024 and was reviewed by Alexander Zvegintsev, Abhishek Kumar and Sergey Bylokhov.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk22u:

$ git fetch https://github.com/openjdk-bots/jdk22u.git backport-Renjithkannath-04d43c43:backport-Renjithkannath-04d43c43
$ git checkout backport-Renjithkannath-04d43c43
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk22u.git backport-Renjithkannath-04d43c43

⚠️ @Renjithkannath You are not yet a collaborator in my fork openjdk-bots/jdk22u. An invite will be sent out and you need to accept it before you can proceed.

Please sign in to comment.