diff options
3 files changed, 147 insertions, 3 deletions
diff --git a/client/src/com/vaadin/client/ui/VTabsheet.java b/client/src/com/vaadin/client/ui/VTabsheet.java index a3d96983e8..7d87650e24 100644 --- a/client/src/com/vaadin/client/ui/VTabsheet.java +++ b/client/src/com/vaadin/client/ui/VTabsheet.java @@ -955,9 +955,7 @@ public class VTabsheet extends VTabsheetBase implements Focusable, */ private void updateTabScroller() { if (!isDynamicWidth()) { - ComponentConnector paintable = ConnectorMap.get(client) - .getConnector(this); - DOM.setStyleAttribute(tabs, "width", paintable.getState().width); + DOM.setStyleAttribute(tabs, "width", "100%"); } // Make sure scrollerIndex is valid diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabBarWidth.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabBarWidth.java new file mode 100644 index 0000000000..01bce334db --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabBarWidth.java @@ -0,0 +1,105 @@ +/* + * Copyright 2000-2013 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.tabsheet; + +import com.vaadin.server.VaadinRequest; +import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Component; +import com.vaadin.ui.TabSheet; +import com.vaadin.ui.VerticalLayout; + +/** + * Tests the width of the tab bar, especially when using relative width for the + * {@link TabSheet}. + * + * Created for ticket <a href="http://dev.vaadin.com/ticket/12805">#12805</a>. + */ +public class TabBarWidth extends AbstractTestUI { + + @Override + protected void setup(VaadinRequest request) { + final VerticalLayout layout = new VerticalLayout(); + layout.setMargin(true); + layout.setSpacing(true); + layout.setWidth("500px"); + setContent(layout); + + // Add a Button to toggle between the widths and undefined. + Button toggle = new Button("Toggle widths", new Button.ClickListener() { + + private boolean removeWidths = true; + + @Override + public void buttonClick(ClickEvent event) { + restoreOrRemoveWidths(layout, removeWidths); + removeWidths = !removeWidths; + } + }); + toggle.setId("toggleWidths"); + layout.addComponent(toggle); + + // Add TabSheets with different widths specified. + layout.addComponent(newTabSheet(null)); + layout.addComponent(newTabSheet("100%")); + layout.addComponent(newTabSheet("75%")); + layout.addComponent(newTabSheet("50%")); + layout.addComponent(newTabSheet("150px")); + } + + @Override + protected String getTestDescription() { + return "Tests the width of the tab bar."; + } + + @Override + protected Integer getTicketNumber() { + return 12805; + } + + private void restoreOrRemoveWidths(VerticalLayout layout, + boolean removeWidths) { + for (Component component : layout) { + if (component instanceof TabSheet) { + if (removeWidths) { + component.setWidth(null); + component.setCaption("Width: undefined"); + } else { + String originalWidth = (String) ((TabSheet) component) + .getData(); + component.setWidth(originalWidth); + component.setCaption("Width: " + + (originalWidth == null ? "undefined" + : originalWidth)); + } + } + } + } + + private TabSheet newTabSheet(String width) { + TabSheet tabSheet = new TabSheet(); + tabSheet.setCaption("Width: " + (width == null ? "undefined" : width)); + tabSheet.setWidth(width); + tabSheet.setData(width); + + // Add dummy components to fill the TabSheet. + for (int i = 1; i <= 10; i++) { + tabSheet.addComponent(new Button(i + ". tab")); + } + return tabSheet; + } +} diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabBarWidthTest.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabBarWidthTest.java new file mode 100644 index 0000000000..f09a68d576 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabBarWidthTest.java @@ -0,0 +1,41 @@ +/* + * Copyright 2000-2013 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.tabsheet; + +import org.junit.Test; + +import com.vaadin.tests.tb3.MultiBrowserTest; + +public class TabBarWidthTest extends MultiBrowserTest { + + @Test + public void testWidths() throws Exception { + openTestURL(); + + // Initial rendering. + compareScreen("tab-bar-width-init"); + + // Remove all widths. + vaadinElementById("toggleWidths").click(); + compareScreen("tab-bar-width-undefined"); + + // Restore all widths. This should restore the rendering to the same + // point as the initial rendering. + vaadinElementById("toggleWidths").click(); + compareScreen("tab-bar-width-restored"); + } + +} |