From 90c749208f5c919c1b670ddac08826192998675e Mon Sep 17 00:00:00 2001 From: Matti Tahvonen Date: Wed, 7 Apr 2010 10:15:32 +0000 Subject: [PATCH] fixes #4492, clicks on tree node icons are now similarly handled as clicks on caption text svn changeset:12348/svn branch:6.3 --- .../vaadin/terminal/gwt/client/ui/VTree.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTree.java b/src/com/vaadin/terminal/gwt/client/ui/VTree.java index 4fcca723da..867c3bbcbf 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VTree.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VTree.java @@ -234,9 +234,11 @@ public class VTree extends FlowPanel implements Paintable, VHasDropHandler { .equals(currentMouseOverKey)) { keyToNode.get(newKey).emphasis(detail); } - /* Else drag is already on a different - * node-detail pair, - * new criteria check is going on */ + /* + * Else drag is already on a different + * node-detail pair, new criteria check is + * going on + */ } }, currentDrag); @@ -439,8 +441,12 @@ public class VTree extends FlowPanel implements Paintable, VHasDropHandler { } final int type = DOM.eventGetType(event); final Element target = DOM.eventGetTarget(event); - if (client.hasEventListeners(VTree.this, ITEM_CLICK_EVENT_ID) - && target == nodeCaptionSpan + final boolean inCaption = target == nodeCaptionSpan + || target == icon.getElement(); + if (inCaption + && client + .hasEventListeners(VTree.this, ITEM_CLICK_EVENT_ID) + && (type == Event.ONDBLCLICK || type == Event.ONMOUSEUP)) { fireClick(event); } @@ -448,7 +454,7 @@ public class VTree extends FlowPanel implements Paintable, VHasDropHandler { if (getElement() == target || ie6compatnode == target) { // state change toggleState(); - } else if (!readonly && target == nodeCaptionSpan) { + } else if (!readonly && inCaption) { // caption click = selection change && possible click event toggleSelection(); } -- 2.39.5