[google-web-toolkit commit] r3692 - trunk/user/src/com/google/gwt/user/client/ui
codesite...@google.com
Date: Mon Sep 29 13:51:58 2008
New Revision: 3692
Modified:
trunk/user/src/com/google/gwt/user/client/ui/Tree.java
trunk/user/src/com/google/gwt/user/client/ui/TreeItem.java
Log:
Fixed a TreeItem bug where leaf nodes were converted to full nodes when a
child was added, but they were assumed to be leaf nodes when the last child
was removed. Now, we check if the item has been converted to a full node
and apply the leaf image if it has, otherwise we apply the margin in place
of the leaf image.
Patch by: jlabanca
Review by: ecc (desk)
Issue: 2491
Modified: trunk/user/src/com/google/gwt/user/client/ui/Tree.java
==============================================================================
--- trunk/user/src/com/google/gwt/user/client/ui/Tree.java (original)
+++ trunk/user/src/com/google/gwt/user/client/ui/Tree.java Mon Sep 29
13:51:58 2008
@@ -777,7 +777,7 @@
* @param treeItem the tree item
*/
void showLeafImage(TreeItem treeItem) {
- if (useLeafImages) {
+ if (useLeafImages || treeItem.isFullNode()) {
showImage(treeItem, images.treeLeaf());
} else {
DOM.setStyleAttribute(treeItem.getElement(), "paddingLeft",
indentValue);
Modified: trunk/user/src/com/google/gwt/user/client/ui/TreeItem.java
==============================================================================
--- trunk/user/src/com/google/gwt/user/client/ui/TreeItem.java (original)
+++ trunk/user/src/com/google/gwt/user/client/ui/TreeItem.java Mon Sep 29
13:51:58 2008
@@ -688,7 +688,7 @@
}
Element getImageHolderElement() {
- if (imageHolder == null) {
+ if (!isFullNode()) {
convertToFullNode();
}
return imageHolder;
@@ -700,6 +700,10 @@
DOM.appendChild(getElement(), childSpanElem);
DOM.setStyleAttribute(childSpanElem, "whiteSpace", "nowrap");
children = new ArrayList<TreeItem>();
+ }
+
+ boolean isFullNode() {
+ return imageHolder != null;
}
void setParentItem(TreeItem parent) {