diff options
author | Tom Schindl | 2016-09-16 09:18:15 +0000 |
---|---|---|
committer | Tom Schindl | 2016-09-16 09:18:15 +0000 |
commit | 95d02d23bf0f5d95324fecad0bc9ba981a7fb5a5 (patch) | |
tree | 083bfd047e65d54d0442437125d702967fb277d3 | |
parent | 202eebdca951ee4bd849bddf7fba7b7972df86d2 (diff) | |
download | org.eclipse.efxclipse-95d02d23bf0f5d95324fecad0bc9ba981a7fb5a5.tar.gz org.eclipse.efxclipse-95d02d23bf0f5d95324fecad0bc9ba981a7fb5a5.tar.xz org.eclipse.efxclipse-95d02d23bf0f5d95324fecad0bc9ba981a7fb5a5.zip |
refs #7
- allow to tag areas in the UI who are not searched
Change-Id: I16000f581c63f18a3d53e5dd2fc517595dbe6890
-rw-r--r-- | bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/Util.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/Util.java b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/Util.java index 3b0be1ce5..f4de568eb 100644 --- a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/Util.java +++ b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/Util.java @@ -13,6 +13,7 @@ package org.eclipse.fx.ui.controls; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.UUID;
@@ -177,10 +178,13 @@ public class Util { return rv;
}
Point2D b = n.screenToLocal(screenX, screenY);
- if (n.getBoundsInLocal().contains(b)) {
+ if (n.getBoundsInLocal().contains(b) && ! FIND_NODE_EXCLUDE.equals(n.getUserData())) {
rv = n;
if (n instanceof Parent) {
- for (Node c : ((Parent) n).getChildrenUnmodifiable()) {
+ List<Node> cList = ((Parent) n).getChildrenUnmodifiable()
+ .stream().filter( no -> no.isVisible()).collect(Collectors.toList());
+
+ for (Node c : cList) {
Node cn = findNode(c, screenX, screenY);
if (cn != null) {
rv = cn;
|