diff options
| author | Teemu Pòˆntelin <teemu@vaadin.com> | 2014-09-24 22:48:55 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-09-29 12:44:27 +0000 |
| commit | 0404f7f5ff0c70e4d2bac6abc7d54ad1910090f8 (patch) | |
| tree | 7284f5681f7af9b90d6a3bbaa2c22ec1f37091a5 /client | |
| parent | e72678558550951dca1cab5d615d7bce8e1878c1 (diff) | |
| download | vaadin-framework-0404f7f5ff0c70e4d2bac6abc7d54ad1910090f8.tar.gz vaadin-framework-0404f7f5ff0c70e4d2bac6abc7d54ad1910090f8.zip | |
Fix ComboBox issue with font-based item icons (#14660)
Change-Id: I8f3de9556cc62670c28523886998f89383b76305
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/com/vaadin/client/ui/VFilterSelect.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/client/src/com/vaadin/client/ui/VFilterSelect.java b/client/src/com/vaadin/client/ui/VFilterSelect.java index 356e7291c4..8e72d1ce52 100644 --- a/client/src/com/vaadin/client/ui/VFilterSelect.java +++ b/client/src/com/vaadin/client/ui/VFilterSelect.java @@ -446,16 +446,13 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, private void selectItem(final MenuItem newSelectedItem) { menu.selectItem(newSelectedItem); - String text = newSelectedItem != null ? newSelectedItem.getText() - : ""; - // Set the icon. FilterSelectSuggestion suggestion = (FilterSelectSuggestion) newSelectedItem .getCommand(); setSelectedItemIcon(suggestion.getIconUri()); // Set the text. - setText(text); + setText(suggestion.getReplacementString()); menu.updateKeyboardSelectedItem(); } |