diff options
author | Sergey Budkin <sergey@vaadin.com> | 2014-10-03 12:25:37 +0300 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2014-10-09 14:10:10 +0000 |
commit | 15bd3fd1dcd01f273da94e9af4461eea843f0706 (patch) | |
tree | 19b5568c1e8d15cdb3d13e3caf6714cd2219d709 /uitest | |
parent | 3f728bea50824b14a3cd5eaa05a7df99e9cd3dda (diff) | |
download | vaadin-framework-15bd3fd1dcd01f273da94e9af4461eea843f0706.tar.gz vaadin-framework-15bd3fd1dcd01f273da94e9af4461eea843f0706.zip |
Incorrect rendering of Panel with undefined size in Firefox (#14631).
Copied the fix from Valo.
Change-Id: I677fc4cfb65a57211fd82d994d75743fd49a83a2
Diffstat (limited to 'uitest')
-rw-r--r-- | uitest/src/com/vaadin/tests/components/panel/UndefinedSizeScrollbars.java | 71 | ||||
-rw-r--r-- | uitest/src/com/vaadin/tests/components/panel/UndefinedSizeScrollbarsTest.java | 31 |
2 files changed, 102 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/panel/UndefinedSizeScrollbars.java b/uitest/src/com/vaadin/tests/components/panel/UndefinedSizeScrollbars.java new file mode 100644 index 0000000000..ef535baa0a --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/panel/UndefinedSizeScrollbars.java @@ -0,0 +1,71 @@ +/* + * 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.panel; + +import com.vaadin.server.VaadinRequest; +import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.CheckBox; +import com.vaadin.ui.ComboBox; +import com.vaadin.ui.GridLayout; +import com.vaadin.ui.Panel; +import com.vaadin.ui.TextField; +import com.vaadin.ui.VerticalLayout; + +public class UndefinedSizeScrollbars extends AbstractTestUI { + + @Override + protected void setup(VaadinRequest request) { + VerticalLayout layout = new VerticalLayout(); + layout.setSpacing(true); + layout.setSizeFull(); + setContent(layout); + + GridLayout grid = new GridLayout(); + grid.setSpacing(true); + + TextField text1 = new TextField(); + text1.setCaption("Text1"); + text1.setRequired(true); + + TextField text2 = new TextField(); + text2.setCaption("Text2"); + text2.setRequired(true); + + ComboBox combo = new ComboBox(); + combo.setCaption("Combo1"); + + CheckBox check = new CheckBox(); + check.setCaption("Check"); + + grid.setColumns(2); + grid.setRows(2); + + grid.addComponent(text1); + grid.addComponent(text2); + grid.addComponent(combo); + grid.addComponent(check); + + grid.setSizeUndefined(); + + Panel panel = new Panel(); + panel.setContent(grid); + + panel.setSizeUndefined(); + + layout.addComponent(panel); + } + +} diff --git a/uitest/src/com/vaadin/tests/components/panel/UndefinedSizeScrollbarsTest.java b/uitest/src/com/vaadin/tests/components/panel/UndefinedSizeScrollbarsTest.java new file mode 100644 index 0000000000..c055356624 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/panel/UndefinedSizeScrollbarsTest.java @@ -0,0 +1,31 @@ +/* + * 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.panel; + +import java.io.IOException; + +import org.junit.Test; + +import com.vaadin.tests.tb3.MultiBrowserTest; + +public class UndefinedSizeScrollbarsTest extends MultiBrowserTest { + + @Test + public void testNoScrollbars() throws IOException { + openTestURL(); + compareScreen("noscrollbars"); + } +} |