changeset 59387:e3372c1cc106

8229856: [macos] Opening a menu on a JTextField can clear the text selection Reviewed-by: psadhukhan, jdv
author trebari
date Wed, 13 May 2020 19:43:46 +0530
parents dd652a1b2a39
children 1e4c144479d3
files src/java.desktop/macosx/classes/com/apple/laf/AquaCaret.java test/jdk/javax/swing/text/Caret/8229856/ContextualMenuClearsTextSelectionTest.java
diffstat 2 files changed, 168 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaCaret.java	Sat May 09 09:49:08 2020 +0530
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaCaret.java	Wed May 13 19:43:46 2020 +0530
@@ -25,15 +25,23 @@
 
 package com.apple.laf;
 
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.Graphics;
+import java.awt.Insets;
+import java.awt.Rectangle;
+import java.awt.event.FocusEvent;
+import java.awt.event.MouseEvent;
 import java.awt.geom.Rectangle2D;
-import java.beans.*;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 
-import javax.swing.*;
+import javax.swing.JEditorPane;
+import javax.swing.JTextArea;
 import javax.swing.border.Border;
 import javax.swing.plaf.UIResource;
-import javax.swing.text.*;
+import javax.swing.text.DefaultCaret;
+import javax.swing.text.Highlighter;
+import javax.swing.text.JTextComponent;
+import javax.swing.SwingUtilities;
 
 @SuppressWarnings("serial") // Superclass is not serializable across versions
 public class AquaCaret extends DefaultCaret
@@ -151,7 +159,8 @@
     // see radar # 3125390
     @Override
     public void mousePressed(final MouseEvent e) {
-        if (!e.isPopupTrigger()) {
+        if (!e.isPopupTrigger() && !(SwingUtilities.isLeftMouseButton(e) &&
+                e.getClickCount() == 3)) {
             super.mousePressed(e);
             shouldSelectAllOnFocus = false;
         }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/javax/swing/text/Caret/8229856/ContextualMenuClearsTextSelectionTest.java	Wed May 13 19:43:46 2020 +0530
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 2020, 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 8229856
+ * @requires (os.family == "mac")
+ * @summary [macos] Opening a menu on a JTextField can clear the text selection
+ * @run main ContextualMenuClearsTextSelectionTest
+ */
+
+import javax.swing.JFrame;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+import javax.swing.JTextField;
+import javax.swing.SwingUtilities;
+import javax.swing.WindowConstants;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.Point;
+import java.awt.Robot;
+
+public class ContextualMenuClearsTextSelectionTest {
+    private static Robot robot;
+    private static Point p;
+    private static JTextField textField;
+    private static JPopupMenu popupMenu;
+    private static JFrame frame;
+    private static boolean isSelectionCleared;
+    public static void main(String[] args) throws Exception{
+        if (!System.getProperty("os.name").startsWith("Mac")) {
+            System.out.println("This test is meant for Mac platform only");
+            return;
+        }
+        try {
+            robot = new Robot();
+            robot.setAutoDelay(50);
+            SwingUtilities.invokeAndWait(() -> {
+                createAndShowGUI();
+            });
+            robot.waitForIdle();
+            SwingUtilities.invokeAndWait(() -> {
+                p = textField.getLocationOnScreen();
+                textField.requestFocusInWindow();
+            });
+            robot.delay(200);
+            robot.waitForIdle();
+
+            robot.mouseMove(p.x + 10, p.y + 10);
+            robot.waitForIdle();
+
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.waitForIdle();
+
+            robot.delay(2000);
+
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.waitForIdle();
+
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.waitForIdle();
+
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.waitForIdle();
+
+            robot.keyPress(KeyEvent.VK_CONTROL);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.waitForIdle();
+
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.keyRelease(KeyEvent.VK_CONTROL);
+            robot.waitForIdle();
+
+            SwingUtilities.invokeAndWait(() -> {
+                isSelectionCleared = textField.getSelectedText() == null
+                                        ? true : false ;
+            });
+
+            if (isSelectionCleared) {
+                throw new RuntimeException("Text selection is cleared");
+            }
+        } finally {
+            if (frame != null) SwingUtilities.invokeAndWait(() ->
+                frame.dispose());
+        }
+    }
+
+    private static void createAndShowGUI() {
+        frame =  new JFrame();
+        frame.setLayout(new BorderLayout());
+        frame.setSize(200,200);
+        textField = new JTextField("word");
+        textField.setSize(100,20);
+        popupMenu = new JPopupMenu();
+        popupMenu.add(new JMenuItem("Apple"));
+        popupMenu.add(new JMenuItem("Pear"));
+        popupMenu.add(new JMenuItem("Grape"));
+        createPopup(textField);
+
+        frame.add(textField, BorderLayout.NORTH);
+        frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+        frame.pack();
+        frame.setVisible(true);
+    }
+
+    private static void createPopup(JTextField f) {
+        MouseAdapter a = new MouseAdapter() {
+            public void mousePressed(MouseEvent e) {
+                if (e.isPopupTrigger()) {
+                    showPopupMenu(e);
+                }
+            }
+            public void mouseReleased(MouseEvent e) {
+                if (e.isPopupTrigger()) {
+                    showPopupMenu(e);
+                }
+            }
+            private void showPopupMenu(MouseEvent e) {
+                popupMenu.show((Component) e.getSource(), e.getX(), e.getY());
+            }
+        };
+        f.addMouseListener(a);
+    }
+}