orderedlayout supports also horizontal

svn changeset:1645/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/TkOrderedLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/TkOrderedLayout.java
index 6514075a006caf9a9965419e752b2546fff6e7ef..419ad0a8bede40738333b21c551ee4bbcce16396 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/TkOrderedLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/TkOrderedLayout.java
@@ -2,21 +2,40 @@ package com.itmill.toolkit.terminal.gwt.client.ui;
 
 import java.util.Iterator;
 
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.Panel;
+import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.itmill.toolkit.terminal.gwt.client.Client;
 import com.itmill.toolkit.terminal.gwt.client.Paintable;
 import com.itmill.toolkit.terminal.gwt.client.UIDL;
 
-public class TkOrderedLayout extends VerticalPanel implements Paintable {
+public class TkOrderedLayout extends Composite implements Paintable {
+       
+       SimplePanel container = new SimplePanel();
+       
+       Panel panel;
+       
+       public TkOrderedLayout() {
+               initWidget(container);
+       }
 
        public void updateFromUIDL(UIDL uidl, Client client) {
-               clear();
-               if (uidl.hasAttribute("caption")) setTitle(uidl.getStringAttribute("caption")); 
+               container.clear();
+               
+               if(uidl.getStringAttribute("orientation").equals("horizontal"))
+                       panel = new HorizontalPanel();
+               else
+                       panel = new VerticalPanel();
+               
+               container.add(panel);
+               
                for (Iterator i = uidl.getChildIterator(); i.hasNext();) {
                        UIDL uidlForChild = (UIDL)i.next();
                        Widget child = client.createWidgetFromUIDL(uidlForChild);
-                       add(child);
+                       panel.add(child);
                }
        }