From f2d4abba38a8d9d3bfea780254c3f65f030f7a17 Mon Sep 17 00:00:00 2001 From: John Ahlroos Date: Fri, 12 Oct 2012 10:19:10 +0300 Subject: Fixed primary stylename handling for CustomLayout #9902 Change-Id: I8ec0da24e73cc182b6d7df6409c348bb61e61d47 --- .../client/ui/customlayout/VCustomLayout.java | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'client') diff --git a/client/src/com/vaadin/client/ui/customlayout/VCustomLayout.java b/client/src/com/vaadin/client/ui/customlayout/VCustomLayout.java index 7a512fac49..803b266550 100644 --- a/client/src/com/vaadin/client/ui/customlayout/VCustomLayout.java +++ b/client/src/com/vaadin/client/ui/customlayout/VCustomLayout.java @@ -21,6 +21,10 @@ import java.util.Iterator; import com.google.gwt.dom.client.ImageElement; import com.google.gwt.dom.client.NodeList; +import com.google.gwt.dom.client.Style; +import com.google.gwt.dom.client.Style.BorderStyle; +import com.google.gwt.dom.client.Style.Position; +import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; import com.google.gwt.user.client.Event; @@ -75,16 +79,22 @@ public class VCustomLayout extends ComplexPanel { public VCustomLayout() { setElement(DOM.createDiv()); // Clear any unwanted styling - DOM.setStyleAttribute(getElement(), "border", "none"); - DOM.setStyleAttribute(getElement(), "margin", "0"); - DOM.setStyleAttribute(getElement(), "padding", "0"); + Style style = getElement().getStyle(); + style.setBorderStyle(BorderStyle.NONE); + style.setMargin(0, Unit.PX); + style.setPadding(0, Unit.PX); if (BrowserInfo.get().isIE()) { - DOM.setStyleAttribute(getElement(), "position", "relative"); + style.setPosition(Position.RELATIVE); } - setStyleName(StyleConstants.UI_LAYOUT); - addStyleName(CLASSNAME); + setStyleName(CLASSNAME); + } + + @Override + public void setStyleName(String style) { + super.setStyleName(style); + addStyleName(StyleConstants.UI_LAYOUT); } /** -- cgit v1.2.3