diff options
Diffstat (limited to 'src/com/vaadin/terminal/gwt/client/MeasureManager.java')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/MeasureManager.java | 217 |
1 files changed, 179 insertions, 38 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/MeasureManager.java b/src/com/vaadin/terminal/gwt/client/MeasureManager.java index cab4822ef4..b4a16fc8c2 100644 --- a/src/com/vaadin/terminal/gwt/client/MeasureManager.java +++ b/src/com/vaadin/terminal/gwt/client/MeasureManager.java @@ -1,5 +1,6 @@ package com.vaadin.terminal.gwt.client; +import java.util.Arrays; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; @@ -14,30 +15,59 @@ public class MeasureManager { public static final class MeasuredSize { private int width = -1; private int height = -1; + + private int[] paddings = new int[4]; + private int[] borders = new int[4]; + private int[] margins = new int[4]; + + private final VPaintableWidget paintable; + private boolean isDirty = true; private final Map<Element, int[]> dependencySizes = new HashMap<Element, int[]>(); - public int getHeight() { + public MeasuredSize(VPaintableWidget paintable) { + this.paintable = paintable; + } + + public int getOuterHeight() { return height; } - public int getWidth() { + public int getOuterWidth() { return width; } - public void setHeight(int height) { + private static int sumWidths(int[] sizes) { + return sizes[1] + sizes[3]; + } + + private static int sumHeights(int[] sizes) { + return sizes[0] + sizes[2]; + } + + public int getInnerHeight() { + return height - sumHeights(margins) - sumHeights(borders) + - sumHeights(paddings); + } + + public int getInnerWidth() { + return width - sumWidths(margins) - sumWidths(borders) + - sumWidths(paddings); + } + + public void setOuterHeight(int height) { if (this.height != height) { isDirty = true; + this.height = height; } - this.height = height; } - public void setWidth(int width) { - if (width != this.width) { + public void setOuterWidth(int width) { + if (this.width != width) { isDirty = true; + this.width = width; } - this.width = width; } public boolean isDirty() { @@ -59,11 +89,11 @@ public class MeasureManager { dependencySizes.remove(element); } - public int getDependencyWidth(Element e) { + public int getDependencyOuterWidth(Element e) { return getDependencySize(e, 0); } - public int getDependencyHeight(Element e) { + public int getDependencyOuterHeight(Element e) { return getDependencySize(e, 1); } @@ -75,6 +105,145 @@ public class MeasureManager { return sizes[index]; } } + + public int getBorderHeight() { + return sumHeights(borders); + } + + public int getBorderWidth() { + return sumWidths(borders); + } + + public int getPaddingHeight() { + return sumHeights(paddings); + } + + public int getPaddingWidth() { + return sumWidths(paddings); + } + + public int getMarginHeight() { + return sumHeights(margins); + } + + public int getMarginWidth() { + return sumWidths(margins); + } + + public int getMarginTop() { + return margins[0]; + } + + public int getMarginRight() { + return margins[1]; + } + + public int getMarginBottom() { + return margins[2]; + } + + public int getMarginLeft() { + return margins[3]; + } + + public int getBorderTop() { + return margins[0]; + } + + public int getBorderRight() { + return margins[1]; + } + + public int getBorderBottom() { + return margins[2]; + } + + public int getBorderLeft() { + return margins[3]; + } + + public int getPaddingTop() { + return paddings[0]; + } + + public int getPaddingRight() { + return paddings[1]; + } + + public int getPaddingBottom() { + return paddings[2]; + } + + public int getPaddingLeft() { + return paddings[3]; + } + + private void measure() { + boolean changed = isDirty; + + Widget widget = paintable.getWidgetForPaintable(); + ComputedStyle computedStyle = new ComputedStyle(widget.getElement()); + + int[] paddings = computedStyle.getPadding(); + if (!changed && !Arrays.equals(this.paddings, paddings)) { + changed = true; + this.paddings = paddings; + } + + int[] margins = computedStyle.getMargin(); + if (!changed && !Arrays.equals(this.margins, margins)) { + changed = true; + this.margins = margins; + } + + int[] borders = computedStyle.getBorder(); + if (!changed && !Arrays.equals(this.borders, borders)) { + changed = true; + this.borders = borders; + } + + int offsetHeight = widget.getOffsetHeight(); + int marginHeight = sumHeights(margins); + setOuterHeight(offsetHeight + marginHeight); + + int offsetWidth = widget.getOffsetWidth(); + int marginWidth = sumWidths(margins); + setOuterWidth(offsetWidth + marginWidth); + + // int i = 0; + for (Entry<Element, int[]> entry : dependencySizes.entrySet()) { + Element element = entry.getKey(); + // int[] elementMargin = new ComputedStyle(element).getMargin(); + int[] sizes = entry.getValue(); + + int elementWidth = element.getOffsetWidth(); + // elementWidth += elementMargin[1] + elementMargin[3]; + if (elementWidth != sizes[0]) { + // System.out.println(paintable.getId() + " dependency " + i + // + " width changed from " + sizes[0] + " to " + // + elementWidth); + sizes[0] = elementWidth; + changed = true; + } + + int elementHeight = element.getOffsetHeight(); + // Causes infinite loops as a negative margin based on the + // measured height is currently used for captions + // elementHeight += elementMargin[0] + elementMargin[1]; + if (elementHeight != sizes[1]) { + // System.out.println(paintable.getId() + " dependency " + i + // + " height changed from " + sizes[1] + " to " + // + elementHeight); + sizes[1] = elementHeight; + changed = true; + } + // i++; + } + + if (changed) { + setDirty(true); + } + } } public void doLayout(ApplicationConnection client) { @@ -178,37 +347,9 @@ public class MeasureManager { FastStringSet changed = FastStringSet.create(); for (VPaintableWidget paintableWidget : paintableWidgets) { - Widget widget = paintableWidget.getWidgetForPaintable(); - MeasureManager.MeasuredSize measuredSize = paintableWidget .getMeasuredSize(); - - measuredSize.setWidth(widget.getOffsetWidth()); - measuredSize.setHeight(widget.getOffsetHeight()); - - boolean dirtyDependency = false; - for (Entry<Element, int[]> entry : measuredSize.dependencySizes - .entrySet()) { - Element element = entry.getKey(); - int[] sizes = entry.getValue(); - - int offsetWidth = element.getOffsetWidth(); - if (offsetWidth != sizes[0]) { - sizes[0] = offsetWidth; - dirtyDependency = true; - } - - int offsetHeight = element.getOffsetHeight(); - if (offsetHeight != sizes[1]) { - sizes[1] = offsetHeight; - dirtyDependency = true; - } - - } - - if (dirtyDependency) { - measuredSize.setDirty(true); - } + measuredSize.measure(); if (measuredSize.isDirty()) { changed.add(paintableMap.getPid(paintableWidget)); |