* For internal use only. May be removed or replaced in the future.
*/
public void updateRootWidth() {
+ updateRootWidth(false);
+ }
+
+ /**
+ * Calculates the width of the select if the select has undefined width.
+ * Should be called when the width changes or when the icon changes.
+ * <p>
+ * For internal use only. May be removed or replaced in the future.
+ *
+ * @param forceUpdate
+ * a flag that forces a recalculation even if one would not
+ * normally be done
+ */
+ public void updateRootWidth(boolean forceUpdate) {
ComponentConnector paintable = ConnectorMap.get(client).getConnector(
this);
if (paintable.isUndefinedWidth()) {
* wide.
*/
int w = Util.getRequiredWidth(this);
- if ((!initDone || currentPage + 1 < 0)
+ if ((forceUpdate || !initDone || currentPage + 1 < 0)
&& suggestionPopupMinWidth > w) {
/*
* We want to compensate for the paddings just to preserve the
import com.vaadin.client.ApplicationConnection;
import com.vaadin.client.Paintable;
import com.vaadin.client.UIDL;
+import com.vaadin.client.communication.StateChangeEvent;
import com.vaadin.client.ui.AbstractFieldConnector;
import com.vaadin.client.ui.SimpleManagedLayout;
import com.vaadin.client.ui.VFilterSelect;
// update textbox text by a changed item caption.
private boolean oldSuggestionTextMatchTheOldSelection;
+ // Need to recompute the width of the combobox when styles change, see
+ // #13444
+ private boolean stylesChanged;
+
/*
* (non-Javadoc)
*
getWidget().popupOpenerClicked = false;
- if (!getWidget().initDone) {
- getWidget().updateRootWidth();
+ // styles have changed or this is our first time - either way we
+ // need to recalculate the root width.
+ if (!getWidget().initDone || stylesChanged) {
+ boolean forceUpdate = true;
+ getWidget().updateRootWidth(forceUpdate);
}
// Focus dependent style names are lost during the update, so we add
getWidget().addStyleDependentName("focus");
}
+ // width has been recalculated above, clear style change flag
+ stylesChanged = false;
+
getWidget().initDone = true;
}
getWidget().enabled = widgetEnabled;
getWidget().tb.setEnabled(widgetEnabled);
}
+
+ @Override
+ public void onStateChanged(StateChangeEvent event) {
+ super.onStateChanged(event);
+ if (event.hasPropertyChanged("styles")) {
+ stylesChanged = true;
+ }
+ }
+
}
--- /dev/null
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.components.ui;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUIWithLog;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.ComboBox;
+
+/**
+ * Test UI for adding a stylename to a combobox with an undefined width.
+ *
+ * @author Vaadin Ltd
+ */
+public class ComboboxStyleChangeWidth extends AbstractTestUIWithLog {
+
+ @Override
+ protected void setup(VaadinRequest request) {
+ final ComboBox cbFoo = new ComboBox();
+ cbFoo.setImmediate(true);
+ cbFoo.setSizeUndefined();
+ cbFoo.addItem("A really long string that causes an inline width to be set");
+
+ Button btn = new Button("Click to break CB",
+ new Button.ClickListener() {
+ @Override
+ public void buttonClick(ClickEvent event) {
+ cbFoo.addStyleName("foofoo");
+
+ }
+ });
+
+ addComponent(cbFoo);
+ addComponent(btn);
+
+ }
+
+ @Override
+ protected String getTestDescription() {
+ return "The computed inline width of an undefined-width ComboBox "
+ + "(with a sufficiently long option string) breaks when "
+ + "the component's stylename is changed after initial "
+ + "rendering.";
+ }
+
+ @Override
+ protected Integer getTicketNumber() {
+ return Integer.valueOf(13444);
+ }
+
+}
--- /dev/null
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.components.ui;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+/**
+ * Tests that changing a stylename will not cause the width parameter to be
+ * removed from a combobox.
+ *
+ * @author Vaadin Ltd
+ */
+
+public class ComboboxStyleChangeWidthTest extends MultiBrowserTest {
+
+ @Test
+ public void testWidthRetained() {
+ openTestURL();
+
+ WebElement comboBox = driver
+ .findElement(By.className("v-filterselect"));
+ String oldStyle = comboBox.getAttribute("style");
+
+ WebElement button = driver.findElement(By.className("v-button"));
+ button.click();
+ String newStyle = comboBox.getAttribute("style");
+
+ assertEquals("width has changed, should remain equal", oldStyle,
+ newStyle);
+
+ }
+
+}
projects / vaadin-framework.git / commitdiff