changeset 9343:5bd72a8fa830 9-b89 9-b90

Merge
author kcr
date Sat, 24 Oct 2015 15:47:49 -0700
parents 0082624c57c9 c8d896f6c38c
children 523320c2c26c 48ad312ec383
files
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TextAreaBehavior.java	Thu Oct 22 02:04:59 2015 -0700
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TextAreaBehavior.java	Sat Oct 24 15:47:49 2015 -0700
@@ -430,7 +430,8 @@
 
         if (contextMenu.isShowing()) {
             contextMenu.hide();
-        } else if (textArea.getContextMenu() == null) {
+        } else if (textArea.getContextMenu() == null &&
+                   textArea.getOnContextMenuRequested() == null) {
             double screenX = e.getScreenX();
             double screenY = e.getScreenY();
             double sceneX = e.getSceneX();
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TextFieldBehavior.java	Thu Oct 22 02:04:59 2015 -0700
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TextFieldBehavior.java	Sat Oct 24 15:47:49 2015 -0700
@@ -342,7 +342,8 @@
 
         if (contextMenu.isShowing()) {
             contextMenu.hide();
-        } else if (textField.getContextMenu() == null) {
+        } else if (textField.getContextMenu() == null && 
+                   textField.getOnContextMenuRequested() == null) {
             double screenX = e.getScreenX();
             double screenY = e.getScreenY();
             double sceneX = e.getSceneX();