summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorHenri Sara <hesara@vaadin.com>2016-07-12 14:34:09 +0300
committerVaadin Code Review <review@vaadin.com>2016-07-13 06:34:54 +0000
commitd5c2320ef0d1ef279f41f9f3925048c882b4a730 (patch)
treea04d757c775e976f754dd664a9a613c49da2443d /client
parent7ac2089afb27af6fdb4f187c934a9a1dde937f1b (diff)
downloadvaadin-framework-d5c2320ef0d1ef279f41f9f3925048c882b4a730.tar.gz
vaadin-framework-d5c2320ef0d1ef279f41f9f3925048c882b4a730.zip
Fix ComboBox highlight width on IE8/9 (#19889)
This fixes an issue caused by the fix for #19658. Change-Id: I688275b0c39af723500bc0f7d0c87799698c90e7
Diffstat (limited to 'client')
-rw-r--r--client/src/main/java/com/vaadin/client/ui/VFilterSelect.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/client/src/main/java/com/vaadin/client/ui/VFilterSelect.java b/client/src/main/java/com/vaadin/client/ui/VFilterSelect.java
index 3efd872e3b..8411e05490 100644
--- a/client/src/main/java/com/vaadin/client/ui/VFilterSelect.java
+++ b/client/src/main/java/com/vaadin/client/ui/VFilterSelect.java
@@ -870,7 +870,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler,
* @param naturalMenuWidth
*/
private void updateMenuWidth(final int desiredWidth,
- final int naturalMenuWidth) {
+ int naturalMenuWidth) {
/**
* Three different width modes for the suggestion pop-up:
*
@@ -885,6 +885,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler,
String width = "auto";
if (suggestionPopupWidth == null) {
if (naturalMenuWidth < desiredWidth) {
+ naturalMenuWidth = desiredWidth - popupOuterPadding;
width = (desiredWidth - popupOuterPadding) + "px";
}
} else if (isrelativeUnits(suggestionPopupWidth)) {