public void onElementResize(ElementResizeEvent e) {
VForm form = getWidget();
- int footerHeight;
+ LayoutManager lm = getLayoutManager();
+ int footerHeight = 0;
if (form.footer != null) {
- LayoutManager lm = getLayoutManager();
- footerHeight = lm.getOuterHeight(form.footer.getElement());
+ footerHeight += lm.getOuterHeight(form.footer.getElement());
+ }
+
+ if (form.errorMessage.isVisible()) {
+ footerHeight += lm.getOuterHeight(form.errorMessage
+ .getElement());
+ footerHeight -= lm.getMarginTop(form.errorMessage.getElement());
+ form.errorMessage.getElement().getStyle()
+ .setMarginTop(-footerHeight, Unit.PX);
+ form.footerContainer.getStyle().clearMarginTop();
} else {
- footerHeight = 0;
+ form.footerContainer.getStyle().setMarginTop(-footerHeight,
+ Unit.PX);
}
form.fieldContainer.getStyle().setPaddingBottom(footerHeight,
Unit.PX);
- form.footerContainer.getStyle()
- .setMarginTop(-footerHeight, Unit.PX);
}
};
@Override
public void onUnregister() {
VForm form = getWidget();
+ if (form.errorMessage.isVisible()) {
+ getLayoutManager().removeElementResizeListener(
+ form.errorMessage.getElement(), footerResizeListener);
+ }
if (form.footer != null) {
getLayoutManager().removeElementResizeListener(
form.footer.getElement(), footerResizeListener);
if (null != getState().errorMessage) {
getWidget().errorMessage.updateMessage(getState().errorMessage);
+ if (!getWidget().errorMessage.isVisible()) {
+ getLayoutManager().addElementResizeListener(
+ getWidget().errorMessage.getElement(),
+ footerResizeListener);
+ }
getWidget().errorMessage.setVisible(true);
} else {
+ if (getWidget().errorMessage.isVisible()) {
+ getLayoutManager().removeElementResizeListener(
+ getWidget().errorMessage.getElement(),
+ footerResizeListener);
+ }
getWidget().errorMessage.setVisible(false);
}
--- /dev/null
+<?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.form.FormErrorVisible?restartApplication</td>
+ <td></td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>vaadin=runcomvaadintestscomponentsformFormErrorVisible::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VForm[0]/VHorizontalLayout[0]/Slot[0]/VButton[0]/domChild[0]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td>again</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
--- /dev/null
+/*
+ * Copyright 2012 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.form;
+
+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.Form;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TextField;
+
+public class FormErrorVisible extends AbstractTestUI {
+
+ @Override
+ protected void setup(VaadinRequest request) {
+ addComponent(buildForm("With footer and error", true, true));
+ addComponent(buildForm("With footer", false, true));
+ addComponent(buildForm("With error", true, false));
+ addComponent(buildForm("With nothing", false, false));
+ addComponent(new Label("The end to see where the last form ends"));
+ }
+
+ private Form buildForm(String caption, boolean withError, boolean withFooter) {
+ Form form = new Form();
+ form.setCaption(caption);
+ form.addField("value", new TextField("MyField"));
+
+ if (withError) {
+ form.setComponentError(new UserError("Has error"));
+ }
+
+ if (withFooter) {
+ form.getFooter().addComponent(new Button("Footer button"));
+ } else {
+ form.setFooter(null);
+ }
+
+ return form;
+ }
+
+ @Override
+ protected String getTestDescription() {
+ return "Footer and error should be taken into account when rendering Form";
+ }
+
+ @Override
+ protected Integer getTicketNumber() {
+ return Integer.valueOf(10460);
+ }
+
+}
projects / vaadin-framework.git / commitdiff