summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-04-04 17:26:07 +0300
committerLeif Åstrand <leif@vaadin.com>2012-04-04 17:26:07 +0300
commitef6c88ecc6b1c2d8884468bff1aa0e2040bfa002 (patch)
tree14c03c90f791bfc57ef67e168cc54c95be1c5590
parent475328f1e7cc6d6e630474441237350fddaa209a (diff)
downloadvaadin-framework-ef6c88ecc6b1c2d8884468bff1aa0e2040bfa002.tar.gz
vaadin-framework-ef6c88ecc6b1c2d8884468bff1aa0e2040bfa002.zip
Allocate full width to relative children.
This reduces the risk of initially adding scrollbars that would require additional propagation to get rid of.
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/AbstractOrderedLayoutConnector.java4
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/AbstractOrderedLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/AbstractOrderedLayoutConnector.java
index 825b54bab6..d98f10c419 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/AbstractOrderedLayoutConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/AbstractOrderedLayoutConnector.java
@@ -7,6 +7,7 @@ import java.util.List;
import com.google.gwt.core.client.GWT;
import com.google.gwt.dom.client.Style;
+import com.google.gwt.dom.client.Style.Unit;
import com.google.gwt.user.client.Element;
import com.google.gwt.user.client.ui.Widget;
import com.vaadin.terminal.gwt.client.ApplicationConnection;
@@ -285,6 +286,9 @@ public abstract class AbstractOrderedLayoutConnector extends
.getStylePrimaryName(), child, this);
}
layout.addOrMove(slot, currentIndex++);
+ if (child.isRelativeWidth()) {
+ slot.getWrapperElement().getStyle().setWidth(100, Unit.PCT);
+ }
}
for (ComponentConnector child : previousChildren) {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
index f9782f5143..c0c14fdee7 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
@@ -562,6 +562,10 @@ public class VGridLayout extends ComplexPanel {
if (slot == null || slot.getChild() != childConnector) {
slot = new ComponentConnectorLayoutSlot(CLASSNAME,
childConnector, getConnector());
+ if (childConnector.isRelativeWidth()) {
+ slot.getWrapperElement().getStyle()
+ .setWidth(100, Unit.PCT);
+ }
Element slotWrapper = slot.getWrapperElement();
getElement().appendChild(slotWrapper);