From a25e0a9aab9ebd926d6a670ec57534454fea63f4 Mon Sep 17 00:00:00 2001 From: Prasanta Sadhukhan Date: Wed, 27 Nov 2024 21:12:01 +0530 Subject: [PATCH 1/3] 8268145: [macos] Rendering artifacts is seen when text inside the JTable with TableCellEditor having JTextfield --- .../classes/com/apple/laf/AquaCaret.java | 21 +++-- .../javax/swing/JTable/TestCaretArtifact.java | 86 +++++++++++++++++++ 2 files changed, 99 insertions(+), 8 deletions(-) create mode 100644 test/jdk/javax/swing/JTable/TestCaretArtifact.java diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaCaret.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaCaret.java index 9b0981aa8b29a..3c1b147d1eab4 100644 --- a/src/java.desktop/macosx/classes/com/apple/laf/AquaCaret.java +++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaCaret.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2024, 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 @@ -189,20 +189,25 @@ protected synchronized void damage(final Rectangle r) { // intersection of the caret rectangle and the component less the border, if any. final Rectangle caretRect = new Rectangle(x, y, width, height); final Border border = getComponent().getBorder(); - if (border != null) { - final Rectangle alloc = getComponent().getBounds(); - alloc.x = alloc.y = 0; + final Rectangle alloc = getComponent().getBounds(); + alloc.x = alloc.y = 0; + if (border != null && border.isBorderOpaque()) { final Insets borderInsets = border.getBorderInsets(getComponent()); alloc.x += borderInsets.left; alloc.y += borderInsets.top; alloc.width -= borderInsets.left + borderInsets.right; alloc.height -= borderInsets.top + borderInsets.bottom; Rectangle2D.intersect(caretRect, alloc, caretRect); + x = caretRect.x; + y = caretRect.y; + width = Math.max(caretRect.width, 1); + height = Math.max(caretRect.height, 1); + } else { + x = alloc.x; + y = alloc.y; + width = alloc.width; + height = alloc.height; } - x = caretRect.x; - y = caretRect.y; - width = Math.max(caretRect.width, 1); - height = Math.max(caretRect.height, 1); repaint(); } diff --git a/test/jdk/javax/swing/JTable/TestCaretArtifact.java b/test/jdk/javax/swing/JTable/TestCaretArtifact.java new file mode 100644 index 0000000000000..aa4b382c0ad08 --- /dev/null +++ b/test/jdk/javax/swing/JTable/TestCaretArtifact.java @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2024, 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 8268145 + * @library /java/awt/regtesthelpers + * @build PassFailJFrame + * @requires (os.family == "mac") + * @summary Verify rendering artifact is not seen moving caret inside + * JTable with TableCellEditor having JTextField + * @run main/manual TestCaretArtifact + */ + +import javax.swing.DefaultCellEditor; +import javax.swing.JFrame; +import javax.swing.JTable; +import javax.swing.JTextField; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableColumn; +import javax.swing.SwingUtilities; + +public class TestCaretArtifact { + + private static final String INSTRUCTIONS = """ + Double click on "Click Here" textfield so that textfield becomes editable; + Press spacebar. Press left arrow button. + Do this few times. + If artifact is seen, press Fail else press Pass."""; + + public static void main(String []args) throws Exception { + PassFailJFrame.builder() + .title("Caret Artifact Instructions") + .instructions(INSTRUCTIONS) + .columns(35) + .testUI(TestCaretArtifact::createUI) + .build() + .awaitAndCheck(); + } + + + public static JFrame createUI() { + TableCellEditor editor = new TestEditor(new JTextField()); + JTable table = new JTable(new Object[][] {{"click here", + "inactive forever"}}, + new Object[] {"1", "2"}); + + JFrame frame = new JFrame(); + TableColumn column = table.getColumn("1"); + column.setCellEditor(editor); + frame.getContentPane().add("Center", table); + frame.setSize(400, 100); + + return frame; + } + + static class TestEditor extends DefaultCellEditor { + public TestEditor(JTextField tf) { + super(tf); + } + public boolean stopCellEditing() { + return false; + } + } +} + From 005ac187364a8e121831d5c9156436327d37cf59 Mon Sep 17 00:00:00 2001 From: Prasanta Sadhukhan Date: Wed, 27 Nov 2024 21:56:00 +0530 Subject: [PATCH 2/3] jcheck --- test/jdk/javax/swing/JTable/TestCaretArtifact.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/jdk/javax/swing/JTable/TestCaretArtifact.java b/test/jdk/javax/swing/JTable/TestCaretArtifact.java index aa4b382c0ad08..3df5f1c8f95c6 100644 --- a/test/jdk/javax/swing/JTable/TestCaretArtifact.java +++ b/test/jdk/javax/swing/JTable/TestCaretArtifact.java @@ -28,7 +28,7 @@ * @build PassFailJFrame * @requires (os.family == "mac") * @summary Verify rendering artifact is not seen moving caret inside - * JTable with TableCellEditor having JTextField + * JTable with TableCellEditor having JTextField * @run main/manual TestCaretArtifact */ From 1797ded4fa9b125f0c2db15d2a1de7bf858d747d Mon Sep 17 00:00:00 2001 From: Prasanta Sadhukhan Date: Thu, 28 Nov 2024 08:30:02 +0530 Subject: [PATCH 3/3] Test fix --- test/jdk/javax/swing/JTable/TestCaretArtifact.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/jdk/javax/swing/JTable/TestCaretArtifact.java b/test/jdk/javax/swing/JTable/TestCaretArtifact.java index 3df5f1c8f95c6..98e174315a907 100644 --- a/test/jdk/javax/swing/JTable/TestCaretArtifact.java +++ b/test/jdk/javax/swing/JTable/TestCaretArtifact.java @@ -48,7 +48,7 @@ public class TestCaretArtifact { Do this few times. If artifact is seen, press Fail else press Pass."""; - public static void main(String []args) throws Exception { + public static void main(String[] args) throws Exception { PassFailJFrame.builder() .title("Caret Artifact Instructions") .instructions(INSTRUCTIONS) @@ -65,7 +65,7 @@ public static JFrame createUI() { "inactive forever"}}, new Object[] {"1", "2"}); - JFrame frame = new JFrame(); + JFrame frame = new JFrame("CaretArtifact"); TableColumn column = table.getColumn("1"); column.setCellEditor(editor); frame.getContentPane().add("Center", table);