]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 55ebe13)
Fix GridLayout resize after removing caption (#12011)
authorPatrik Lindström <patrik@vaadin.com>
Thu, 13 Jun 2013 14:03:44 +0000 (17:03 +0300)
committerPatrik Lindström <patrik@vaadin.com>
Thu, 13 Jun 2013 14:15:51 +0000 (17:15 +0300)
Change-Id: Ieda9b23a1cbf6700cc7438d0b404c3229dd27ed8

client/src/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java patch | blob | history
uitest/src/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.html [new file with mode: 0644] patch | blob
uitest/src/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.java [new file with mode: 0644] patch | blob

diff --git a/client/src/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java b/client/src/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java
index e0cb76b714fd5eed697ac645857cf7e39897611d..29d41e00b7b771a3c97f275bba1eec58392919af 100644 (file)
--- a/client/src/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java
+++ b/client/src/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java
@@ -192,6 +192,7 @@ public class GridLayoutConnector extends AbstractComponentContainerConnector
             caption.updateCaption();
         } else {
             layout.setCaption(childConnector.getWidget(), null);
+            getLayoutManager().setNeedsLayout(this);
         }
     }
 
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 (file)
index 0000000..0ad5882
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.html
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>New Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">New Test</td></tr>
+</thead><tbody>
+<tr>
+       <td>open</td>
+       <td>/run/com.vaadin.tests.components.gridlayout.LayoutAfterHidingError?restartApplication</td>
+       <td></td>
+</tr>
+<tr>
+       <td>click</td>
+       <td>vaadin=runcomvaadintestscomponentsgridlayoutLayoutAfterHidingError::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VPanel[0]/VGridLayout[0]/VButton[0]/domChild[0]/domChild[0]</td>
+       <td></td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td>withError</td>
+</tr>
+<tr>
+       <td>click</td>
+       <td>vaadin=runcomvaadintestscomponentsgridlayoutLayoutAfterHidingError::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VPanel[0]/VGridLayout[0]/VButton[1]/domChild[0]/domChild[0]</td>
+       <td></td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td>withoutError</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
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 (file)
index 0000000..dc04e23
--- /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;
+    }
+
+}
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework