// If we're not dealing with a regular pixel number
// but a number that has a weird ending, we need to convert it to pixels
- if ( !/^\d+(px)?$/i.test( ret ) && /^\d/.test( ret ) ) {
- // Remember the original values
- var left = style.left, rsLeft = elem.runtimeStyle.left;
-
- // Put in the new values to get a computed value out
- elem.runtimeStyle.left = cs.left;
- style.left = ret || 0;
- ret = style.pixelLeft + "px";
-
- // Revert the changed values
- style.left = left;
- elem.runtimeStyle.left = rsLeft;
- }
+ if ( !/^\d+(px)?$/i.test( ret ) && /^\d/.test( ret ) ) {
+ // Remember the original values
+ var left = style.left, rsLeft = elem.runtimeStyle.left;
+
+ // Put in the new values to get a computed value out
+ elem.runtimeStyle.left = cs.left;
+ style.left = ret || 0;
+ ret = style.pixelLeft + "px";
+
+ // Revert the changed values
+ style.left = left;
+ elem.runtimeStyle.left = rsLeft;
+ }
}
import com.vaadin.terminal.gwt.client.MeasuredSize.MeasureResult;
import com.vaadin.terminal.gwt.client.ui.ManagedLayout;
import com.vaadin.terminal.gwt.client.ui.PostLayoutListener;
-import com.vaadin.terminal.gwt.client.ui.PreLayoutListener;
import com.vaadin.terminal.gwt.client.ui.SimpleManagedLayout;
import com.vaadin.terminal.gwt.client.ui.layout.ElementResizeEvent;
import com.vaadin.terminal.gwt.client.ui.layout.ElementResizeListener;
private static final boolean debugLogging = false;
- private static int totalLayoutTime = 0;
-
private ApplicationConnection connection;
private final Set<Element> measuredNonConnectorElements = new HashSet<Element>();
private final MeasuredSize nullSize = new MeasuredSize();
Duration totalDuration = new Duration();
- int preLayoutStart = totalDuration.elapsedMillis();
- for (ComponentConnector connector : connection.getConnectorMap()
- .getComponentConnectors()) {
- if (connector instanceof PreLayoutListener) {
- ((PreLayoutListener) connector).preLayout();
- }
- }
- VConsole.log("Invoke pre layout listeners in "
- + (totalDuration.elapsedMillis() - preLayoutStart) + " ms");
-
Map<ManagedLayout, Integer> layoutCounts = new HashMap<ManagedLayout, Integer>();
int passes = 0;
needsVerticalLayout.clear();
for (ComponentConnector connector : needsMeasure) {
+ // Ensure the MeasuredSize is attached to the DOM element before
+ // doing measurements to avoid reflows in "some" browsers
+ getMeasuredSize(connector);
currentDependencyTree.setNeedsMeasure(connector, true);
}
needsMeasure.clear();
VConsole.log(" Measured " + measuredConnectorCount
+ " elements in " + measureTime + " ms");
+ VConsole.log(" Total of " + measureCount
+ + " measurement operations");
+
if (!listenersToFire.isEmpty()) {
for (Element element : listenersToFire) {
Collection<ElementResizeListener> listeners = elementResizeListeners
VConsole.log("Invoke post layout listeners in "
+ (totalDuration.elapsedMillis() - postLayoutStart) + " ms");
- VConsole.log("Total layout phase time: "
- + totalDuration.elapsedMillis() + "ms");
+ VConsole.log("<b>Total layout phase time: "
+ + totalDuration.elapsedMillis() + "ms</b>");
- totalLayoutTime += totalDuration.elapsedMillis();
- VConsole.log("");
- VConsole.log("### Total combined layout phase: " + totalLayoutTime
- + "ms");
- VConsole.log("");
}
private void logConnectorStatus(int connectorId) {
ComponentConnector[] connectors = ConnectorMap.get(connection)
.getComponentConnectors();
for (ComponentConnector connector : connectors) {
- measueConnector(connector);
+ measureConnector(connector);
}
for (ComponentConnector connector : connectors) {
layoutDependencyTree.setNeedsMeasure(connector, false);
Collection<ComponentConnector> measureTargets = layoutDependencyTree
.getMeasureTargets();
for (ComponentConnector connector : measureTargets) {
- measueConnector(connector);
+ measureConnector(connector);
measureCount++;
}
for (ComponentConnector connector : measureTargets) {
return measureCount;
}
- private void measueConnector(ComponentConnector connector) {
- Element element = connector.getWidget().getElement();
+ private void measureConnector(ComponentConnector connector) {
MeasuredSize measuredSize = getMeasuredSize(connector);
+ if (!isManagedLayout(connector)
+ && !isManagedLayout(connector.getParent())
+ && elementResizeListeners.get(connector.getWidget()
+ .getElement()) == null && !measuredSize.hasDependents()) {
+ return;
+ }
+
+ Element element = connector.getWidget().getElement();
MeasureResult measureResult = measuredAndUpdate(element, measuredSize);
if (measureResult.isChanged()) {
+ " non connector elements");
}
+ int measureCount = 0;
+
private MeasureResult measuredAndUpdate(Element element,
MeasuredSize measuredSize) {
+ measureCount++;
MeasureResult measureResult = measuredSize.measure(element);
if (measureResult.isChanged()) {
notifyListenersAndDepdendents(element,
// extra space equally if no expand ratios are specified inside a
// layout with specified size
if (expandRatios.getKeySet().size() == 0
- && ((getWidget().vertical && !isUndefinedHeight()) || !isUndefinedWidth())) {
+ && ((getWidget().vertical && !isUndefinedHeight()) || (!getWidget().vertical && !isUndefinedWidth()))) {
expandRatio = 1;
hasExpandRatio.add(child);
} else if (expandRatios.containsKey(pid)
} else {
expandRatio = -1;
hasExpandRatio.remove(child);
+ if (expandRatios.getKeySet().size() > 0
+ || hasExpandRatio.size() > 0) {
+ // Only add resize listeners if there are expand ratios in
+ // use
+ getLayoutManager().addElementResizeListener(
+ child.getWidget().getElement(),
+ childComponentResizeListener);
+ if (slot.hasCaption()) {
+ getLayoutManager().addElementResizeListener(
+ slot.getCaptionElement(),
+ slotCaptionResizeListener);
+ }
+ }
+ }
+ slot.setExpandRatio(expandRatio);
+
+ if (slot.getSpacingElement() != null && needsExpand()) {
+ getLayoutManager().addElementResizeListener(
+ slot.getSpacingElement(), spacingResizeListener);
+ } else if (slot.getSpacingElement() != null) {
+ getLayoutManager().removeElementResizeListener(
+ slot.getSpacingElement(), spacingResizeListener);
+ }
+
+ }
+
+ if (needsFixedHeight()) {
+ for (ComponentConnector child : getChildren()) {
+ Slot slot = layout.getSlot(child);
getLayoutManager().addElementResizeListener(
child.getWidget().getElement(),
childComponentResizeListener);
slotCaptionResizeListener);
}
}
- slot.setExpandRatio(expandRatio);
-
- if (slot.getSpacingElement() != null) {
- getLayoutManager().addElementResizeListener(
- slot.getSpacingElement(), spacingResizeListener);
- }
-
}
if (needsExpand()) {
getLayoutManager().addElementResizeListener(
slot.getSpacingElement(), spacingResizeListener);
} else if (slot.getSpacingElement() != null) {
- getLayoutManager().addElementResizeListener(
+ getLayoutManager().removeElementResizeListener(
slot.getSpacingElement(), spacingResizeListener);
}
.getOuterHeight(captionElement));
}
}
- // System.out.println(" ### SlotCaption sizes: "
- // + childCaptionElementHeight.values().toString());
+ System.out.println(" ### Child sizes: "
+ + childElementHeight.values().toString());
+ System.out.println(" ### Caption sizes: "
+ + childCaptionElementHeight.values().toString());
// If no height has been set, use the natural height for the
// component (this is mostly just a precaution so that something
--- /dev/null
+package com.vaadin.tests.components.orderedlayout;
+
+import com.vaadin.Application.LegacyApplication;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Root;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.themes.Reindeer;
+
+public class LayoutRenderTimeTest extends LegacyApplication {
+
+ @Override
+ public void init() {
+ Root.LegacyWindow main = new Root.LegacyWindow();
+ setMainWindow(main);
+
+ VerticalLayout root = new VerticalLayout();
+ root.setWidth("100%");
+ main.setContent(root);
+
+ for (int i = 1; i <= 100; i++) {
+ root.addComponent(getRow(i));
+ }
+ }
+
+ private HorizontalLayout getRow(int i) {
+ HorizontalLayout row = new HorizontalLayout();
+ // row.setWidth("100%");
+ // row.setSpacing(true);
+
+ Embedded icon = new Embedded(null, new ThemeResource(
+ "../runo/icons/32/document.png"));
+ // row.addComponent(icon);
+ // row.setComponentAlignment(icon, Alignment.MIDDLE_LEFT);
+
+ Label text = new Label(
+ "Row content #"
+ + i
+ + ". In pellentesque faucibus vestibulum. Nulla at nulla justo, eget luctus tortor. Nulla facilisi. Duis aliquet.");
+ // row.addComponent(text);
+ // row.setExpandRatio(text, 1);
+
+ Button button = new Button("Edit");
+ button.addStyleName(Reindeer.BUTTON_SMALL);
+ row.addComponent(button);
+ // row.setComponentAlignment(button, Alignment.MIDDLE_LEFT);
+
+ button = new Button("Delete");
+ button.addStyleName(Reindeer.BUTTON_SMALL);
+ row.addComponent(button);
+ // row.setComponentAlignment(button, Alignment.MIDDLE_LEFT);
+
+ return row;
+ }
+}
projects / vaadin-framework.git / commitdiff