Browse Source

Yet another fix for #4144

svn changeset:13184/svn branch:6.3
tags/6.7.0.beta1
John Alhroos 14 years ago
parent
commit
b0699dd777
1 changed files with 9 additions and 2 deletions
  1. 9
    2
      src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java

+ 9
- 2
src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java View File

@@ -595,6 +595,7 @@ public class VFilterSelect extends Composite implements Paintable, Field,
private boolean filtering = false;
private boolean selecting = false;
private boolean tabPressed = false;
private boolean initDone = false;

private String lastFilter = "";
private int lastIndex = -1; // last selected index when using arrows
@@ -856,6 +857,8 @@ public class VFilterSelect extends Composite implements Paintable, Field,
popupOpenerClicked = false;

updateRootWidth();

initDone = true;
}

private void setPromptingOn() {
@@ -1134,7 +1137,10 @@ public class VFilterSelect extends Composite implements Paintable, Field,
}
horizPaddingAndBorder = Util.setWidthExcludingPaddingAndBorder(this,
width, horizPaddingAndBorder);
updateRootWidth();

if (initDone) {
updateRootWidth();
}
}

@Override
@@ -1157,7 +1163,8 @@ public class VFilterSelect extends Composite implements Paintable, Field,
- Util.measureMarginLeft(selectedItemIcon.getElement()) : 0;

int w = tbWidth + openerWidth + iconWidth;
if (currentPage + 1 <= 0 && suggestionPopupMinWidth > w) {
if ((!initDone || currentPage + 1 <= 0)
&& suggestionPopupMinWidth > w) {
setTextboxWidth(suggestionPopupMinWidth);
w = suggestionPopupMinWidth;
} else {

Loading…
Cancel
Save