Browse Source

Change forceUpdate flag to always force recalculation of width. Fix tests. (#13444)

Change-Id: Ie666e2867908160b1544d3bf8251802ea771660f
tags/7.4.0.alpha2
Markus Koivisto 10 years ago
parent
commit
dd7bcd16de

+ 2
- 1
client/src/com/vaadin/client/ui/VFilterSelect.java View File

@@ -1950,7 +1950,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler,
* wide.
*/
int w = Util.getRequiredWidth(this);
if ((forceUpdate || !initDone || currentPage + 1 < 0)

if (forceUpdate || (!initDone || currentPage + 1 < 0)
&& suggestionPopupMinWidth > w) {
/*
* We want to compensate for the paddings just to preserve the

+ 4
- 5
uitest/src/com/vaadin/tests/components/ui/ComboboxStyleChangeWidthTest.java View File

@@ -18,9 +18,9 @@ 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.testbench.elements.ButtonElement;
import com.vaadin.testbench.elements.ComboBoxElement;
import com.vaadin.tests.tb3.MultiBrowserTest;

/**
@@ -36,11 +36,10 @@ public class ComboboxStyleChangeWidthTest extends MultiBrowserTest {
public void testWidthRetained() {
openTestURL();

WebElement comboBox = driver
.findElement(By.className("v-filterselect"));
ComboBoxElement comboBox = $(ComboBoxElement.class).first();
String oldStyle = comboBox.getAttribute("style");

WebElement button = driver.findElement(By.className("v-button"));
ButtonElement button = $(ButtonElement.class).first();
button.click();
String newStyle = comboBox.getAttribute("style");


Loading…
Cancel
Save