]> source.dussan.org Git - vaadin-framework.git/commitdiff
Alignments fixed for IE and Firefox. Should work with at least simple components...
authorJouni Koivuviita <jouni.koivuviita@itmill.com>
Fri, 16 Nov 2007 10:14:47 +0000 (10:14 +0000)
committerJouni Koivuviita <jouni.koivuviita@itmill.com>
Fri, 16 Nov 2007 10:14:47 +0000 (10:14 +0000)
svn changeset:2840/svn branch:trunk

src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java

index 1ebf559ad22efa62e71784da54eddefdbb5ffe6b..17cef81ea23876194e3e1d8b2b64388b6fbbffcf 100644 (file)
@@ -15,6 +15,7 @@ import com.itmill.toolkit.terminal.gwt.client.Container;
 import com.itmill.toolkit.terminal.gwt.client.Paintable;
 import com.itmill.toolkit.terminal.gwt.client.StyleConstants;
 import com.itmill.toolkit.terminal.gwt.client.UIDL;
+import com.itmill.toolkit.terminal.gwt.client.Util;
 
 /**
  * Abstract base class for ordered layouts. Use either vertical or horizontal
@@ -413,12 +414,21 @@ public abstract class IOrderedLayout extends ComplexPanel implements Container {
                        AlignmentInfo ai = new AlignmentInfo(alignments[alignmentIndex++]);
 
                        Element td = DOM.getParent(((Widget) it.next()).getElement());
-                       DOM.setStyleAttribute(td, "vertical-align", ai
-                                       .getVerticalAlignment());
+                       if (Util.isIE()) {
+                               DOM.setElementAttribute(td, "vAlign", ai
+                                               .getVerticalAlignment());
+                       } else {
+                               DOM.setStyleAttribute(td, "verticalAlign", ai
+                                               .getVerticalAlignment());
+                       }
                        // TODO use one-cell table to implement horizontal alignments
-                       DOM
-                                       .setStyleAttribute(td, "text-align", ai
-                                                       .getHorizontalAlignment());
+                       if (Util.isIE()) {
+                               DOM.setElementAttribute(td, "align", ai
+                                               .getHorizontalAlignment());
+                       } else {
+                               DOM.setStyleAttribute(td, "textAlign", ai
+                                               .getHorizontalAlignment());
+                       }
                }
        }