*/
private boolean hasChildrenWithRelativeHeight = false;
+ /**
+ * Keep track of whether any child is middle aligned. Used to determine if
+ * measurements are needed to make middle aligned children work.
+ */
+ private boolean hasChildrenWithMiddleAlignment = false;
+
/**
* Keeps track of whether slots should be expanded based on available space.
*/
processedResponseId = lastResponseId;
hasChildrenWithRelativeHeight = false;
+ hasChildrenWithMiddleAlignment = false;
needsExpand = getWidget().vertical ? !isUndefinedHeight()
: !isUndefinedWidth();
getState().childData.get(child).alignmentBitmask);
slot.setAlignment(alignment);
+ if (alignment.isVerticalCenter()) {
+ hasChildrenWithMiddleAlignment = true;
+ }
+
double expandRatio = onlyZeroExpands ? 1 : getState().childData
.get(child).expandRatio;
return false;
}
- else if (!hasChildrenWithRelativeHeight) {
- // Already works if there are no relative heights
+ else if (!hasChildrenWithRelativeHeight
+ && !hasChildrenWithMiddleAlignment) {
+ // Already works if there are no relative heights or middle aligned
+ // children
return 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="http://localhost:8888/" />
+<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.orderedlayout.HorizontalLayoutVerticalAlign?restartApplication</td>
+ <td></td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td>alignments</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
--- /dev/null
+package com.vaadin.tests.components.orderedlayout;
+
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TextArea;
+
+public class HorizontalLayoutVerticalAlign extends TestBase {
+
+ @Override
+ protected void setup() {
+ HorizontalLayout p = new HorizontalLayout();
+
+ p.addComponent(new TextArea());
+
+ Label top = new Label("top");
+ p.addComponent(top);
+ p.setComponentAlignment(top, Alignment.TOP_CENTER);
+
+ Label middle = new Label("middle");
+ p.addComponent(middle);
+ p.setComponentAlignment(middle, Alignment.MIDDLE_CENTER);
+
+ Label bottom = new Label("bottom");
+ p.addComponent(bottom);
+ p.setComponentAlignment(bottom, Alignment.BOTTOM_CENTER);
+
+ p.addComponent(new TextArea());
+
+ addComponent(p);
+ }
+
+ @Override
+ protected String getDescription() {
+ return "Vertical alignments should be top-middle-bottom";
+ }
+
+ @Override
+ protected Integer getTicketNumber() {
+ return 10852;
+ }
+
+}
projects / vaadin-framework.git / commitdiff