merged [8456] and [8455] to 6.1

svn changeset:8457/svn branch:6.1

src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java

@@ -706,7 +706,7 @@ public class VFilterSelect extends Composite implements Paintable, Field,
             currentSuggestions.add(suggestion);
             if (optionUidl.hasAttribute("selected")) {
                 if (!filtering || popupOpenerClicked) {
-                    tb.setText(suggestion.getReplacementString());
+                    setPromptingOff(suggestion.getReplacementString());
                     selectedOptionKey = "" + suggestion.getOptionKey();
                 }
                 currentSuggestion = suggestion;
@@ -769,15 +769,19 @@ public class VFilterSelect extends Composite implements Paintable, Field,
     }
 
     private void setPromptingOn() {
-        prompting = true;
-        addStyleDependentName(CLASSNAME_PROMPT);
+        if (!prompting) {
+            prompting = true;
+            addStyleDependentName(CLASSNAME_PROMPT);
+        }
         tb.setText(inputPrompt);
     }
 
     private void setPromptingOff(String text) {
         tb.setText(text);
-        prompting = false;
-        removeStyleDependentName(CLASSNAME_PROMPT);
+        if (prompting) {
+            prompting = false;
+            removeStyleDependentName(CLASSNAME_PROMPT);
+        }
     }
 
     public void onSuggestionSelected(FilterSelectSuggestion suggestion) {

src/com/vaadin/terminal/gwt/client/ui/VOrderedLayout.java

@@ -798,7 +798,7 @@ public class VOrderedLayout extends CellBasedLayout {
 
     @Override
     public void setWidth(String width) {
-        if (this.width.equals(width)) {
+        if (this.width.equals(width) || !isVisible()) {
             return;
         }
         Size sizeBefore = new Size(activeLayoutSize.getWidth(),