diff options
| author | John Alhroos <john.ahlroos@itmill.com> | 2011-08-16 12:20:30 +0000 |
|---|---|---|
| committer | John Alhroos <john.ahlroos@itmill.com> | 2011-08-16 12:20:30 +0000 |
| commit | 1bf9cba4c6282163fa56ef7f9780ed0e2268e486 (patch) | |
| tree | 10c9345b718e2427cff62579288703f997babc40 /src/com/vaadin | |
| parent | 39bf8185b95149ab535699966ca4f3e38a0d37ea (diff) | |
| download | vaadin-framework-1bf9cba4c6282163fa56ef7f9780ed0e2268e486.tar.gz vaadin-framework-1bf9cba4c6282163fa56ef7f9780ed0e2268e486.zip | |
Fixed issue with toggling tooltips on/off #5414
svn changeset:20417/svn branch:6.7
Diffstat (limited to 'src/com/vaadin')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java | 8 | ||||
| -rw-r--r-- | src/com/vaadin/ui/Table.java | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java index 1f854f18f8..ad69d8a751 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java @@ -4426,6 +4426,9 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, if (rowDescription != null && !rowDescription.equals("")) { TooltipInfo info = new TooltipInfo(rowDescription); client.registerTooltip(VScrollTable.this, rowElement, info); + } else { + // Remove possibly previously set tooltip + client.registerTooltip(VScrollTable.this, rowElement, null); } tHead.getColumnAlignments(); @@ -4526,9 +4529,12 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, } } - if (description != null && client != null) { + if (description != null && !description.equals("")) { TooltipInfo info = new TooltipInfo(description); client.registerTooltip(VScrollTable.this, td, info); + } else { + // Remove possibly previously set tooltip + client.registerTooltip(VScrollTable.this, td, null); } td.appendChild(container); diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java index d9446de5d1..fd18bf0fd7 100644 --- a/src/com/vaadin/ui/Table.java +++ b/src/com/vaadin/ui/Table.java @@ -46,7 +46,6 @@ import com.vaadin.terminal.Resource; import com.vaadin.terminal.gwt.client.MouseEventDetails; import com.vaadin.terminal.gwt.client.ui.VScrollTable; import com.vaadin.terminal.gwt.client.ui.dd.VLazyInitItemIdentifiers; -import com.vaadin.ui.AbstractSelect.ItemDescriptionGenerator; /** * <p> @@ -4586,7 +4585,10 @@ public class Table extends AbstractSelect implements Action.Container, * The generator to use or null to disable */ public void setItemDescriptionGenerator(ItemDescriptionGenerator generator){ - itemDescriptionGenerator = generator; + if (generator != itemDescriptionGenerator) { + itemDescriptionGenerator = generator; + refreshRenderedCells(); + } } /** |