Browse Source

Merged: [9096] fix for #3444 Opera missing components and [9097] CellBasedLayout style typo

svn changeset:9099/svn branch:6.2
tags/6.7.0.beta1
Henri Sara 14 years ago
parent
commit
bb7b759968

+ 2
- 2
src/com/vaadin/terminal/gwt/client/ui/VOrderedLayout.java View File

relativeSizeComponentUIDL.add(childUIDL); relativeSizeComponentUIDL.add(childUIDL);
} else { } else {
if (isDynamicWidth()) { if (isDynamicWidth()) {
childComponentContainer.renderChild(childUIDL, client, 0);
childComponentContainer.renderChild(childUIDL, client, -1);
} else { } else {
childComponentContainer.renderChild(childUIDL, client, childComponentContainer.renderChild(childUIDL, client,
activeLayoutSize.getWidth()); activeLayoutSize.getWidth());
UIDL childUIDL = relativeSizeComponentUIDL.get(i); UIDL childUIDL = relativeSizeComponentUIDL.get(i);
if (isDynamicWidth()) { if (isDynamicWidth()) {
childComponentContainer.renderChild(childUIDL, client, 0);
childComponentContainer.renderChild(childUIDL, client, -1);
} else { } else {
childComponentContainer.renderChild(childUIDL, client, childComponentContainer.renderChild(childUIDL, client,
activeLayoutSize.getWidth()); activeLayoutSize.getWidth());

+ 3
- 1
src/com/vaadin/terminal/gwt/client/ui/layout/CellBasedLayout.java View File

helper = Document.get().createDivElement(); helper = Document.get().createDivElement();
helper helper
.setInnerHTML("<div style=\"position:absolute;top:0;left:0;height:0;visibility:hidden;overflow:hidden;\">" .setInnerHTML("<div style=\"position:absolute;top:0;left:0;height:0;visibility:hidden;overflow:hidden;\">"
+ "<div style=\"width:0;height:0;visibility:hidden;overflow;hidden;\"></div></div><div style=\"position:absolute;height:0;overflow:hidden;\"></div>");
+ "<div style=\"width:0;height:0;visibility:hidden;overflow:hidden;\">"
+ "</div></div>"
+ "<div style=\"position:absolute;height:0;overflow:hidden;\"></div>");
NodeList<Node> childNodes = helper.getChildNodes(); NodeList<Node> childNodes = helper.getChildNodes();
measurement = (DivElement) childNodes.getItem(0); measurement = (DivElement) childNodes.getItem(0);
measurement2 = (DivElement) measurement.getFirstChildElement(); measurement2 = (DivElement) measurement.getFirstChildElement();

+ 10
- 9
src/com/vaadin/terminal/gwt/client/ui/layout/ChildComponentContainer.java View File

private int captionHeight = 0; private int captionHeight = 0;


/** /**
*
*
* Padding added to the container when it is larger than the component. * Padding added to the container when it is larger than the component.
*/ */
private Size containerExpansion = new Size(0, 0); private Size containerExpansion = new Size(0, 0);
/* /*
* Must remove width specification from container before rendering to * Must remove width specification from container before rendering to
* allow components to grow in horizontal direction. * allow components to grow in horizontal direction.
*
*
* For fixed width layouts we specify the width directly so that height * For fixed width layouts we specify the width directly so that height
* is automatically calculated correctly (e.g. for Labels). * is automatically calculated correctly (e.g. for Labels).
*/ */
/* /*
* This should no longer be needed (after #2563) as all components are * This should no longer be needed (after #2563) as all components are
* such that they can be rendered inside a 0x0 DIV. * such that they can be rendered inside a 0x0 DIV.
*
* The exception seems to be complex components (Tree and Table) on
* Opera (#3444).
*/ */
// if (fixedWidth > 0) {
// setLimitedContainerWidth(fixedWidth);
// } else {
// setUnlimitedContainerWidth();
// }
if (fixedWidth < 0 && BrowserInfo.get().isOpera()) {
setUnlimitedContainerWidth();
}
((Paintable) widget).updateFromUIDL(childUIDL, client); ((Paintable) widget).updateFromUIDL(childUIDL, client);
} }


/** /**
* Return true if the size of the widget has been specified in the selected * Return true if the size of the widget has been specified in the selected
* orientation. * orientation.
*
*
* @return * @return
*/ */
public boolean widgetHasSizeSpecified(int orientation) { public boolean widgetHasSizeSpecified(int orientation) {
/** /**
* Sets the normalized expand ratio of this slot. The fraction that this * Sets the normalized expand ratio of this slot. The fraction that this
* slot will use of "excess space". * slot will use of "excess space".
*
*
* @param expandRatio * @param expandRatio
*/ */
public void setNormalizedExpandRatio(double expandRatio) { public void setNormalizedExpandRatio(double expandRatio) {

Loading…
Cancel
Save