From 7830af22d8fc47874eacf64b98ee07e73279f281 Mon Sep 17 00:00:00 2001 From: Patrik Lindström Date: Thu, 13 Jun 2013 17:03:44 +0300 Subject: Fix GridLayout resize after removing caption (#12011) Change-Id: Ieda9b23a1cbf6700cc7438d0b404c3229dd27ed8 --- .../gridlayout/LayoutAfterHidingError.html | 42 ++++++++++++ .../gridlayout/LayoutAfterHidingError.java | 76 ++++++++++++++++++++++ 2 files changed, 118 insertions(+) create mode 100644 uitest/src/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.html create mode 100644 uitest/src/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.java (limited to 'uitest/src') diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.html b/uitest/src/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.html new file mode 100644 index 0000000000..0ad58823be --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.html @@ -0,0 +1,42 @@ + + + + + + +New Test + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
New Test
open/run/com.vaadin.tests.components.gridlayout.LayoutAfterHidingError?restartApplication
clickvaadin=runcomvaadintestscomponentsgridlayoutLayoutAfterHidingError::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VPanel[0]/VGridLayout[0]/VButton[0]/domChild[0]/domChild[0]
screenCapturewithError
clickvaadin=runcomvaadintestscomponentsgridlayoutLayoutAfterHidingError::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VPanel[0]/VGridLayout[0]/VButton[1]/domChild[0]/domChild[0]
screenCapturewithoutError
+ + diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.java b/uitest/src/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.java new file mode 100644 index 0000000000..dc04e23f02 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.java @@ -0,0 +1,76 @@ +/* + * 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.gridlayout; + +import com.vaadin.server.UserError; +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.Button.ClickListener; +import com.vaadin.ui.DateField; +import com.vaadin.ui.GridLayout; +import com.vaadin.ui.Panel; + +public class LayoutAfterHidingError extends AbstractTestUI { + + @Override + protected void setup(VaadinRequest request) { + final Panel panel = new Panel(); + panel.setWidth("300px"); + addComponent(panel); + + GridLayout gl = new GridLayout(); + gl.setWidth("100%"); + panel.setContent(gl); + + final DateField df = new DateField(); + df.setWidth("100%"); + gl.addComponent(df); + + Button err = new Button("Set error"); + err.addClickListener(new ClickListener() { + + @Override + public void buttonClick(ClickEvent event) { + df.setComponentError(new UserError("foo")); + } + }); + gl.addComponent(err); + + err = new Button("Clear error"); + err.addClickListener(new ClickListener() { + + @Override + public void buttonClick(ClickEvent event) { + df.setComponentError(null); + } + }); + gl.addComponent(err); + } + + @Override + protected String getTestDescription() { + return "Setting an error icon for a component in GridLayout and then removing it should properly re-size the component"; + } + + @Override + protected Integer getTicketNumber() { + return 12011; + } + +} -- cgit v1.2.3